diff --git a/dotfiles/config/xmonad/flake.lock b/dotfiles/config/xmonad/flake.lock index d8eb370c..67898275 100644 --- a/dotfiles/config/xmonad/flake.lock +++ b/dotfiles/config/xmonad/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -41,29 +41,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -74,19 +56,18 @@ }, "git-ignore-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1694102001, - "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=", + "lastModified": 1762808025, + "narHash": "sha256-XmjITeZNMTQXGhhww6ed/Wacy2KzD6svioyCX7pkUu4=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6", + "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c", "type": "github" }, "original": { "owner": "hercules-ci", - "ref": "master", "repo": "gitignore.nix", "type": "github" } @@ -96,11 +77,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1694102001, - "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=", + "lastModified": 1762808025, + "narHash": "sha256-XmjITeZNMTQXGhhww6ed/Wacy2KzD6svioyCX7pkUu4=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6", + "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c", "type": "github" }, "original": { @@ -115,11 +96,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1694102001, - "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=", + "lastModified": 1762808025, + "narHash": "sha256-XmjITeZNMTQXGhhww6ed/Wacy2KzD6svioyCX7pkUu4=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6", + "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c", "type": "github" }, "original": { @@ -131,11 +112,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693099187, - "narHash": "sha256-FXCc6OIghv9k4xYOhSMZI6bj7o56S8BJKzKtTKzdUVQ=", - "path": "/nix/store/wr9zk0l6xw1bi0zjrrsj998b5wgykyz5-source", - "rev": "cf2004afe4d4b95a295c63c911e949e40915eedb", - "type": "path" + "lastModified": 1666603677, + "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", + "type": "github" }, "original": { "id": "nixpkgs", @@ -144,11 +126,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1666603677, - "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=", + "lastModified": 1769740369, + "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe", + "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", "type": "github" }, "original": { @@ -184,23 +166,11 @@ "type": "indirect" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1693099187, - "narHash": "sha256-FXCc6OIghv9k4xYOhSMZI6bj7o56S8BJKzKtTKzdUVQ=", - "path": "/nix/store/wr9zk0l6xw1bi0zjrrsj998b5wgykyz5-source", - "rev": "cf2004afe4d4b95a295c63c911e949e40915eedb", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "git-ignore-nix": "git-ignore-nix", + "nixpkgs": "nixpkgs_2", "xmonad": "xmonad", "xmonad-contrib": "xmonad-contrib" } @@ -250,44 +220,13 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "unstable": { "locked": { - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "unstable_2": { - "locked": { - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -300,56 +239,18 @@ "xmonad": { "inputs": { "flake-utils": "flake-utils_2", - "git-ignore-nix": "git-ignore-nix", + "git-ignore-nix": "git-ignore-nix_2", "nixpkgs": [ "nixpkgs" ], "unstable": "unstable" }, "locked": { - "lastModified": 1, - "narHash": "sha256-dOrvPpypuNn/fAWY2XjMacpsAXEiMZ4Dll3Ot81iQL4=", - "path": "./xmonad", - "type": "path" - }, - "original": { - "path": "./xmonad", - "type": "path" - } - }, - "xmonad-contrib": { - "inputs": { - "flake-utils": "flake-utils_3", - "git-ignore-nix": "git-ignore-nix_2", - "nixpkgs": [ - "nixpkgs" - ], - "xmonad": "xmonad_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-MwbeBTfcf6vE7bQvha4ueg5zLZxBiU3678ESYrXD4lw=", - "path": "./xmonad-contrib", - "type": "path" - }, - "original": { - "path": "./xmonad-contrib", - "type": "path" - } - }, - "xmonad_2": { - "inputs": { - "flake-utils": "flake-utils_4", - "git-ignore-nix": "git-ignore-nix_3", - "nixpkgs": "nixpkgs_5", - "unstable": "unstable_2" - }, - "locked": { - "lastModified": 1695471545, - "narHash": "sha256-3EK3rWNuPsc4FwkY7S1sPVI4hr9O7/AXI5AqdO0gJ/A=", + "lastModified": 1767819257, + "narHash": "sha256-U7MIHr0B10wDSNgUvq4QTK22HZ4pl2oIYkdOKEMnxC4=", "owner": "xmonad", "repo": "xmonad", - "rev": "327c2cf0c14f8eec234ec74d1a657d3e2fd5df11", + "rev": "bb33042d408c15d8727011b1ed4aa22b2716d73d", "type": "github" }, "original": { @@ -357,6 +258,32 @@ "repo": "xmonad", "type": "github" } + }, + "xmonad-contrib": { + "inputs": { + "flake-utils": "flake-utils_3", + "git-ignore-nix": "git-ignore-nix_3", + "nixpkgs": [ + "nixpkgs" + ], + "xmonad": [ + "xmonad" + ] + }, + "locked": { + "lastModified": 1755152326, + "narHash": "sha256-47gGXt1TxzfQx/6X895t/T8Ozj+7fmQdU1i4cwyxcSg=", + "owner": "IvanMalison", + "repo": "xmonad-contrib", + "rev": "1a8da46855ca83e11cfb31cbbaed980ed7a8dfcc", + "type": "github" + }, + "original": { + "owner": "IvanMalison", + "ref": "withMyChanges", + "repo": "xmonad-contrib", + "type": "github" + } } }, "root": "root", diff --git a/dotfiles/config/xmonad/flake.nix b/dotfiles/config/xmonad/flake.nix index e35c92c0..ba886a9a 100644 --- a/dotfiles/config/xmonad/flake.nix +++ b/dotfiles/config/xmonad/flake.nix @@ -1,16 +1,18 @@ { inputs = { - flake-utils.url = github:numtide/flake-utils; - xmonad-contrib = { - url = path:./xmonad-contrib; + flake-utils.url = "github:numtide/flake-utils"; + git-ignore-nix.url = "github:hercules-ci/gitignore.nix"; + xmonad = { + url = "github:xmonad/xmonad"; inputs.nixpkgs.follows = "nixpkgs"; }; - xmonad = { - url = path:./xmonad; + xmonad-contrib = { + url = "github:IvanMalison/xmonad-contrib/withMyChanges"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.xmonad.follows = "xmonad"; }; }; - outputs = { self, flake-utils, nixpkgs, xmonad, xmonad-contrib }: + outputs = { self, flake-utils, nixpkgs, xmonad, xmonad-contrib, git-ignore-nix }: let overlay = import ./overlay.nix; overlays = [ overlay xmonad.overlay xmonad-contrib.overlay ]; diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs index 039dc849..7ddb0d56 100644 --- a/dotfiles/config/xmonad/xmonad.hs +++ b/dotfiles/config/xmonad/xmonad.hs @@ -1019,7 +1019,7 @@ addKeys conf@XConfig { modMask = modm } = -- Non-XMonad , ((modm, xK_v), spawn "xclip -o | xdotool type --file -") - , ((hyper, xK_v), spawn "rofi_clipboard.sh") + , ((hyper, xK_v), spawn "rofi -modi 'clipboard:greenclip print' -show clipboard") , ((hyper, xK_p), spawn "rofi-pass") , ((hyper, xK_h), spawn "rofi_shutter") , ((hyper, xK_c), spawn "shell_command.sh")