broken flakes atm, migrated nix to symlinks, added new hetzner host

This commit is contained in:
Ryan 2024-05-20 23:53:45 -04:00
parent c5bc1749c7
commit adf9468e7a
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
6 changed files with 146 additions and 8 deletions

View file

@ -32,7 +32,9 @@
(prepend gcc-12))))) (prepend gcc-12)))))
(define %home-symlinks (define %home-symlinks
`((".config/guix/home-config/fish" ".config/fish"))) `((".config/guix/home-config/fish" ".config/fish")
(".config/guix/home-config/nix-config" ".config/nix")
(".config/guix/home-config/nix-home-manager" ".config/home-manager")))
(home-symlinks %home-symlinks) (home-symlinks %home-symlinks)
@ -150,9 +152,7 @@
("pulse/client.conf" ,(local-file "pulseaudio/client.conf")) ("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))
("waybar" ,(local-file "waybar" #:recursive? #t)) ("waybar" ,(local-file "waybar" #:recursive? #t))
("alacritty" ,(local-file "alacritty" #:recursive? #t)) ("alacritty" ,(local-file "alacritty" #:recursive? #t))
("aerc" ,(local-file "aerc" #:recursive? #t)) ("aerc" ,(local-file "aerc" #:recursive? #t)) ))
("home-manager" ,(local-file "nix-home-manager" #:recursive? #t))
("nix" ,(local-file "nix-config" #:recursive? #t)) ))
(service home-files-service-type (service home-files-service-type
`((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim")) `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
(".ssh/config" ,(local-file "ssh/config")) (".ssh/config" ,(local-file "ssh/config"))

View file

@ -1,5 +1,79 @@
{ {
"nodes": { "nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gomod2nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"superfile",
"nixpkgs"
]
},
"locked": {
"lastModified": 1710154385,
"narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=",
"owner": "nix-community",
"repo": "gomod2nix",
"rev": "872b63ddd28f318489c929d25f1f0a3c6039c971",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "gomod2nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -60,7 +134,61 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprpicker-git": "hyprpicker-git", "hyprpicker-git": "hyprpicker-git",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"superfile": "superfile"
}
},
"superfile": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"gomod2nix": "gomod2nix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1715556404,
"narHash": "sha256-lG4hvdi0JNOG1s05UrmDKxwhk6TrFDWZsxHrWGw6vCM=",
"owner": "MHNightCat",
"repo": "superfile",
"rev": "eaed7829b07de14528ac203aad8a5ac5c04c68ef",
"type": "github"
},
"original": {
"owner": "MHNightCat",
"repo": "superfile",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
} }
} }
}, },

View file

@ -12,9 +12,13 @@
url = "github:hyprwm/hyprpicker"; url = "github:hyprwm/hyprpicker";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
superfile = {
url = "github:MHNightCat/superfile";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { nixpkgs, home-manager, hyprpicker-git, ... }: outputs = { nixpkgs, home-manager, hyprpicker-git, superfile, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@ -34,6 +38,7 @@
# Optionally use extraSpecialArgs # Optionally use extraSpecialArgs
# to pass through arguments to home.nix # to pass through arguments to home.nix
extraSpecialArgs = {inherit inputs;};
}; };
}; };
} }

View file

@ -43,6 +43,7 @@
gdu gdu
spotify-player spotify-player
hyprpicker hyprpicker
superfile
# # It is sometimes useful to fine-tune packages, for example, by applying # # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the # # overrides. You can do that directly here, just don't forget the

View file

@ -12,5 +12,9 @@ Host hetzner
HostName 5.161.207.21 HostName 5.161.207.21
User root User root
Host rncorepub
Hostname 5.161.89.186
User root
Host * Host *
KexAlgorithms -sntrup761x25519-sha512@openssh.com KexAlgorithms -sntrup761x25519-sha512@openssh.com

View file

@ -131,7 +131,7 @@
"adwaita-icon-theme" "adwaita-icon-theme"
"hicolor-icon-theme" "hicolor-icon-theme"
"git" "git"
"waybar" ;"waybar"
"gnupg" "gnupg"
"light" "light"
"avahi" "avahi"
@ -158,7 +158,7 @@
"wireplumber" "wireplumber"
"wireshark" "wireshark"
"zsh")) "zsh"))
(list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new) (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new waybar-new)
%my-base-packages )) %my-base-packages ))
;; Below is the list of system services. To search for available ;; Below is the list of system services. To search for available