nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update flake.lock, fix package

Browse Source 
migrate hyprland config
This commit is contained in:
NullBite 2024-08-04 18:39:37 -04:00
parent 4731dd5441
commit 797421666b
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
4 changed files with 74 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
flake.lock generated
View File

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1720546205,
"narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
"lastModified": 1722339003,
"narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
"owner": "ryantm",
"repo": "agenix",
"rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
"rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
"type": "github"
},
"original": {
@ -43,11 +43,11 @@
]
},
"locked": {
"lastModified": 1722100913,
"narHash": "sha256-75Hcx5Zu0f+BeCkZxN1frkYacjbkwgCq+z3doVgr4Hw=",
"lastModified": 1722347739,
"narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "4918e57979bbdbd05aabb20f63e1cb5dc289bcbd",
"rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
"type": "github"
},
"original": {
@ -371,11 +371,11 @@
]
},
"locked": {
"lastModified": 1722119539,
"narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
"lastModified": 1722630065,
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
"rev": "afc892db74d65042031a093adb6010c4c3378422",
"type": "github"
},
"original": {
@ -444,11 +444,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1721332982,
"narHash": "sha256-UiNq9EDnnWXaG7d5AExvPlzapuw4VyWnFHTo38Q3kn4=",
"lastModified": 1722631742,
"narHash": "sha256-HJWmbQo/vseT2vb3yQsbrN/gnlKj21HWRqlZrJp44Os=",
"owner": "hyprwm",
"repo": "hypridle",
"rev": "e5366d34b5e1f06a1233667cded3ef05b482778c",
"rev": "96d51ec2a749a928cb9d48b1fc0ea4898e73a335",
"type": "github"
},
"original": {
@ -469,11 +469,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1722181325,
"narHash": "sha256-tBpry8IeRnwj8ThDsj4tzPo6WrOnERJe7HANCwN/rZY=",
"lastModified": 1722773977,
"narHash": "sha256-AqSmHptledo4Tp+hrHWovGR+e//bejR458sRmhq+jT4=",
"ref": "refs/heads/main",
"rev": "fcff2dcac24ca497a39c1cb271d449ade037b7ad",
"revCount": 5005,
"rev": "5dd2c27b631f16e49a2c6e6cbbefba9fa50bf543",
"revCount": 5050,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -651,11 +651,11 @@
]
},
"locked": {
"lastModified": 1720709712,
"narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=",
"lastModified": 1722636442,
"narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade",
"rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6",
"type": "github"
},
"original": {
@ -686,11 +686,11 @@
]
},
"locked": {
"lastModified": 1722136042,
"narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=",
"lastModified": 1722740924,
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "c0ca47e8523b578464014961059999d8eddd4aae",
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
"type": "github"
},
"original": {
@ -708,11 +708,11 @@
]
},
"locked": {
"lastModified": 1722127904,
"narHash": "sha256-JzGDHU8aIyifFTefnteYvVyNe7r86Rx8bQsrraD/BEI=",
"lastModified": 1722559629,
"narHash": "sha256-BDnSIH6Ccd09MNmYY1N+rxBPN0zSSH5+9WkXN4K8rqE=",
"owner": "Silveere",
"repo": "nix-minecraft",
"rev": "2d4dc70aa7baa1360dc7f0d9f44c1ab0dc59c23f",
"rev": "9f98a05b4e3f75a001b5f94da400d689157b48cb",
"type": "github"
},
"original": {
@ -731,11 +731,11 @@
]
},
"locked": {
"lastModified": 1722130825,
"narHash": "sha256-wT3ujK3g3Ybqj2F7fNIBrEHY4SbEtoiI/mrUUPr//Fs=",
"lastModified": 1722562463,
"narHash": "sha256-LctuHlTmJPqQna/3F10v4eNE8/KYh2bu0naEwalJ73o=",
"owner": "infinidoge",
"repo": "nix-minecraft",
"rev": "c04c517fc3d5f0d3e577b09b8bc527a18a95b79b",
"rev": "6c5e8f138e4ba944f423850148651e00589dde73",
"type": "github"
},
"original": {
@ -753,11 +753,11 @@
]
},
"locked": {
"lastModified": 1722012218,
"narHash": "sha256-Rnjo49C5/slnmcQW9c57IdiHJZ3YEFmUn3as/NIPD4E=",
"lastModified": 1722253092,
"narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "ac026940beb42f74c5666f6ed3989aca41eddeea",
"rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
"type": "github"
},
"original": {
@ -791,11 +791,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1721924956,
"narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5ad6a14c6bf098e98800b091668718c336effc95",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
@ -805,13 +805,29 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"nixpkgs-nix-du": {
"locked": {
"lastModified": 1722141560,
"narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
"lastModified": 1722785290,
"narHash": "sha256-LzUGwvBGkZLiJc5WeUo6ZXWGqZPEfmQuS+E9fM8bTpY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
"rev": "c933cf4698e5189b35dd83bf4d7a81aef16d464a",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c933cf4698e5189b35dd83bf4d7a81aef16d464a",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1722640603,
"narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
"type": "github"
},
"original": {
@ -839,11 +855,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1722087241,
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
"lastModified": 1722519197,
"narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8c50662509100d53229d4be607f1a3a31157fa12",
"rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
"type": "github"
},
"original": {
@ -868,6 +884,7 @@
"nix-wsl": "nix-wsl",
"nixfiles-assets": "nixfiles-assets",
"nixpkgs": "nixpkgs_2",
"nixpkgs-nix-du": "nixpkgs-nix-du",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-yt-dlp-2024": "nixpkgs-yt-dlp-2024",
"rust-overlay": "rust-overlay",
@ -882,11 +899,11 @@
]
},
"locked": {
"lastModified": 1722133294,
"narHash": "sha256-XKSVN+lmjVEFPjMa5Ui0VTay2Uvqa74h0MQT0HU1pqw=",
"lastModified": 1722738111,
"narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9803f6e04ca37a2c072783e8297d2080f8d0e739",
"rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280",
"type": "github"
},
"original": {
@ -1050,11 +1067,11 @@
]
},
"locked": {
"lastModified": 1722181019,
"narHash": "sha256-Lj/g1UzrsTZUixtveQix6eB3pon2j23qv5/5pzTx0LQ=",
"lastModified": 1722365976,
"narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "0e2f3b9c85f7bab3983098a01366876d34daf383",
"rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -8,6 +8,8 @@
nixpkgs-yt-dlp-2024.url = "github:NixOS/nixpkgs/528db5fa94041f0b4909a855d8b9fb9b44fa4f5d";
nixpkgs-nix-du.url = "github:NixOS/nixpkgs/c933cf4698e5189b35dd83bf4d7a81aef16d464a";
# this seems to be a popular way to declare systems
systems.url = "github:nix-systems/default";

2
home/sessions/hyprland/default.nix
View File

@ -276,7 +276,7 @@ in
"$mod, O, togglesplit," # dwindle"
"$mod, f, fullscreen"
"$mod SHIFT, f, fakefullscreen"
"$mod SHIFT, f, fullscreenstate, -1 2"
"$mod CTRL, f, fullscreen, 1"
# Move focus with mod + arrow keys

7
overlays/mitigations.nix
View File

@ -4,6 +4,8 @@ let
inherit (lib) recurseIntoAttrs optionalAttrs
versionOlder versionAtLeast;
pkgsFromFlake = flake: (import flake.outPath) { inherit (prev) system; };
pkgsFromInput = name: pkgsFromFlake nixfiles.inputs.${name};
pickFixed = ours: theirs: if versionAtLeast ours.version theirs.version then ours else theirs;
pickNewer = ours: theirs: if versionOlder theirs.version ours.version then ours else theirs;
@ -20,6 +22,11 @@ let
# this also causes an infinite recursion and i have no idea why
# in nixfiles.inputs.nixpkgs.lib.filterAttrs (k: v: v != null) {
in {
nix-du = let
old = prev.nix-du;
new = (pkgsFromInput "nixpkgs-nix-du").nix-du;
in pickNewer old new;
gimp-with-plugins = gimp-with-plugins-good;
yt-dlp = let