chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixing upgrades and updates

Browse source
This commit is contained in:
Chris Cochrun 2024-09-06 10:01:48 -05:00
parent 4c1e79088c
commit c5c0a98c5a
5 changed files with 102 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
flake.lock
View file

@ -3,11 +3,11 @@
"advisory-db": { "advisory-db": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714183630, "lastModified": 1722017365,
"narHash": "sha256-1BVft7ggSN2XXFeXQjazU3jN9wVECd9qp2mZx/8GDMk=", "narHash": "sha256-9wYR5NZIgI+qzMDlJrUzevR31fvFQRgfjlYp50Xp3Ts=",
"owner": "rustsec", "owner": "rustsec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "35e7459a331d3e0c585e56dabd03006b9b354088", "rev": "9d024c07ee8c18609b43436bc865abf46636e250",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +175,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715274763, "lastModified": 1722907532,
"narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", "narHash": "sha256-i/j/dMZPR7uJoQPFTa6UCahLu8kMtozYuR83lIKMERM=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", "rev": "d0c8f4ed8571c533b31c1d68e4ebc534b790cc5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +197,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1724119075, "lastModified": 1725614258,
"narHash": "sha256-rZe4WgHhLqhu4NjGVYyIQ36ieHZgSkfnNMdLzKaqFQk=", "narHash": "sha256-QhrhRVdcpCxz22rGXjjvuKij3PjMFN/DMlSIKZk9eaM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e197771f35c8c330324256c5f306614f273ffd9d", "rev": "5d87c6391f09134b214a85eb3b28ecbebbad7269",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +219,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1720177068, "lastModified": 1725366879,
"narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=", "narHash": "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f", "rev": "8661abf2bf07f5a809fc995233d93810cc1ac871",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,11 +326,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1710146030,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,7 +377,10 @@
}, },
"flake-utils_5": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": [
"stylix",
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -433,11 +436,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723986931, "lastModified": 1725628988,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +458,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715930644, "lastModified": 1724435763,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,7 +473,7 @@
}, },
"libre-presenter": { "libre-presenter": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
@ -509,16 +512,16 @@
"nix-bitcoin": { "nix-bitcoin": {
"inputs": { "inputs": {
"extra-container": "extra-container", "extra-container": "extra-container",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
"lastModified": 1723533469, "lastModified": 1724684170,
"narHash": "sha256-8gSsZpYmOzwFRaLIX0OMBvV/+SATmu/O9QXkDgsZlIg=", "narHash": "sha256-4O04EoHn87zIpiogIRXSgkqRyOs7ygIAIO9dhjhpmGI=",
"owner": "fort-nix", "owner": "fort-nix",
"repo": "nix-bitcoin", "repo": "nix-bitcoin",
"rev": "6e208d6a7b554be592167f6ecad9b16c0abf96d7", "rev": "31b79391cf96b64c3982038c8284e04345429dbd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -530,11 +533,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1724067415, "lastModified": 1725477728,
"narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -573,11 +576,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1723938990, "lastModified": 1725407940,
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -605,11 +608,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1723221148, "lastModified": 1724395761,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -637,11 +640,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1723282977, "lastModified": 1724316499,
"narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +656,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1723991338, "lastModified": 1725432240,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a3354191c0d7144db9756a74755672387b702ba", "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -696,6 +699,29 @@
"type": "indirect" "type": "indirect"
} }
}, },
"plasma-manager": {
"inputs": {
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1725575977,
"narHash": "sha256-1e9zB0dMRwdAbhxVATlL25rExMDh4gZ/3AXdkpU8408=",
"owner": "nix-community",
"repo": "plasma-manager",
"rev": "b82b9ba85c156a5e7f865cc94ed2a4df20cbbf39",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "plasma-manager",
"type": "github"
}
},
"quickemu": { "quickemu": {
"inputs": { "inputs": {
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
@ -718,18 +744,18 @@
"inputs": { "inputs": {
"advisory-db": "advisory-db", "advisory-db": "advisory-db",
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1724168344, "lastModified": 1725360130,
"narHash": "sha256-JqBcwOOeiXFtVGKFrutTVALleh/3wbzgIZzSh3k67bk=", "narHash": "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "8922388caa8ad879bdc2b82267bb5122afb77a1e", "rev": "d39ba83cfc7c7685548d18652fef039e25b19276",
"revCount": 2083, "revCount": 2100,
"type": "git", "type": "git",
"url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git" "url": "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
}, },
@ -749,6 +775,7 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"plasma-manager": "plasma-manager",
"quickemu": "quickemu", "quickemu": "quickemu",
"radicle": "radicle", "radicle": "radicle",
"rust-overlay": "rust-overlay_3", "rust-overlay": "rust-overlay_3",
@ -758,18 +785,17 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"eww", "eww",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1708999822, "lastModified": 1723688259,
"narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=", "narHash": "sha256-WzeUR1MG9MnJnh9T7qcVe/v12qHvJvzdc3Z5HCeE2ns=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911", "rev": "6e75319846684326d900daff1e2e11338cc80d2b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -780,21 +806,17 @@
}, },
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": [
"radicle",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"radicle", "radicle",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1715307487, "lastModified": 1722910815,
"narHash": "sha256-yuDAys3JuJmhQUQGMMsl3BDQNZUYZDw0eA71OVh9FeY=", "narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ec7a7caf50877bc32988c82653d6b3e6952a8c3f", "rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -810,11 +832,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724120436, "lastModified": 1725589472,
"narHash": "sha256-/MvfxTjco5UDBF6SEvwyeXrXwZG7nz7/mDVreQNKsWg=", "narHash": "sha256-+OB00N6Yql/ZRQQkQ0PNnxfW2tH89DHnv29hBS7tXMM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "48e61fe824f5823e4f3f15dd9a75c19c63649269", "rev": "2b00881d2ff72174cffdc007238cb6bedd6e1d8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -855,18 +877,20 @@
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_5",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1724091143, "lastModified": 1725290973,
"narHash": "sha256-55CrA0BNqmnS4qB812D7JY9hNBB0r36sJlErepkfeTo=", "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "94d70292d0c687ebacb65d00bd516cbefa18d3ca", "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -10,7 +10,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
plasma-manager = { plasma-manager = {
url = "githube:nix-community/plasma-manager"; url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };

4
home/modules/hyprland.nix
View file

@ -207,8 +207,12 @@ in
"float,nm-tray" "float,nm-tray"
"size 60% 60%,dolphin" "size 60% 60%,dolphin"
"float,mpv" "float,mpv"
"float,title:Picture-in-Picture"
"center,title:Picture-in-Picture"
"size ${if laptop then "90% 76%" else "85% 85%"},mpv" "size ${if laptop then "90% 76%" else "85% 85%"},mpv"
"${if laptop then "workspace 1,idk #dummy rule" else "workspace 9,mpv"}" "${if laptop then "workspace 1,idk #dummy rule" else "workspace 9,mpv"}"
"${if laptop then "workspace 1,idk #dummy rule" else "workspace 9,title:Picture-In-Picture"}"
"${if laptop then "workspace 1,idk #dummy rule" else "fullscreen,title:Picture-In-Picture"}"
"center,mpv" "center,mpv"
"opaque,mpv" "opaque,mpv"
"float,pulsemixer" "float,pulsemixer"

3
scripts/update-nix
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
currentdir=$(pwd) currentdir=$(pwd)
if [[hostname == "kaladin"]]; then hostname=$(hostname)
if [[ $hostname == kaladin ]]; then
cd ~/.config/dotfiles cd ~/.config/dotfiles
else else
cd ~/.dotfiles cd ~/.dotfiles

7
scripts/upgrade-nix
View file

@ -1,5 +1,10 @@
#!/bin/sh #!/bin/sh
currentdir=$(pwd) currentdir=$(pwd)
cd ~/.config/dotfiles/ hostname=$(hostname)
if [[ $hostname == kaladin ]]; then
cd ~/.config/dotfiles
else
cd ~/.dotfiles
fi
nixos-rebuild --use-remote-sudo switch --show-trace --verbose --impure --flake .# nixos-rebuild --use-remote-sudo switch --show-trace --verbose --impure --flake .#
cd $currentdir cd $currentdir