Merge branch 'main' of github.com:fwastring/nix
This commit is contained in:
commit
b33636b24d
24 changed files with 657 additions and 372 deletions
409
flake.lock
generated
409
flake.lock
generated
|
@ -33,6 +33,89 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"base16": {
|
||||||
|
"inputs": {
|
||||||
|
"fromYaml": "fromYaml"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1755819240,
|
||||||
|
"narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
|
||||||
|
"owner": "SenchoPens",
|
||||||
|
"repo": "base16.nix",
|
||||||
|
"rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "SenchoPens",
|
||||||
|
"repo": "base16.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"base16-fish": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1622559957,
|
||||||
|
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
|
||||||
|
"owner": "tomyun",
|
||||||
|
"repo": "base16-fish",
|
||||||
|
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tomyun",
|
||||||
|
"repo": "base16-fish",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"base16-helix": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1752979451,
|
||||||
|
"narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "base16-helix",
|
||||||
|
"rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "base16-helix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"base16-vim": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1732806396,
|
||||||
|
"narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "base16-vim",
|
||||||
|
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "base16-vim",
|
||||||
|
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"firefox-gnome-theme": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1756083905,
|
||||||
|
"narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=",
|
||||||
|
"owner": "rafaelmardojai",
|
||||||
|
"repo": "firefox-gnome-theme",
|
||||||
|
"rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "rafaelmardojai",
|
||||||
|
"repo": "firefox-gnome-theme",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -123,19 +206,40 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"fw-pkgs": {
|
"flake-parts_3": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": [
|
||||||
|
"stylix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730710113,
|
"lastModified": 1756770412,
|
||||||
"narHash": "sha256-6DtfJyoScSuTKVjPH8INHACl/7qX3OqbA61UI2u5a1c=",
|
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
||||||
"owner": "fwastring",
|
"owner": "hercules-ci",
|
||||||
"repo": "fwpkgs",
|
"repo": "flake-parts",
|
||||||
"rev": "fb322b3c8c413c3bd4d5222fe4b9566ab2998c58",
|
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "fwastring",
|
"owner": "hercules-ci",
|
||||||
"ref": "main",
|
"repo": "flake-parts",
|
||||||
"repo": "fwpkgs",
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"fromYaml": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731966426,
|
||||||
|
"narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
|
||||||
|
"owner": "SenchoPens",
|
||||||
|
"repo": "fromYaml",
|
||||||
|
"rev": "106af9e2f715e2d828df706c386a685698f3223b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "SenchoPens",
|
||||||
|
"repo": "fromYaml",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -149,11 +253,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755960406,
|
"lastModified": 1757239681,
|
||||||
"narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=",
|
"narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
|
"rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -206,6 +310,23 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"gnome-shell": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1748186689,
|
||||||
|
"narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
|
||||||
|
"owner": "GNOME",
|
||||||
|
"repo": "gnome-shell",
|
||||||
|
"rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "GNOME",
|
||||||
|
"ref": "48.2",
|
||||||
|
"repo": "gnome-shell",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"hercules-ci-effects": {
|
"hercules-ci-effects": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts_2",
|
||||||
|
@ -235,16 +356,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756679287,
|
"lastModified": 1757385184,
|
||||||
"narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
|
"narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
|
"rev": "26993d87fd0d3b14f7667b74ad82235f120d986e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.05",
|
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -294,11 +414,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755678602,
|
"lastModified": 1756891319,
|
||||||
"narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=",
|
"narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprgraphics",
|
"repo": "hyprgraphics",
|
||||||
"rev": "157cc52065a104fc3b8fa542ae648b992421d1c7",
|
"rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -323,11 +443,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756977414,
|
"lastModified": 1757423991,
|
||||||
"narHash": "sha256-Hz5S4fILpYd1smWDZ+uLYjHgW22v6JS/04j15I4cFZE=",
|
"narHash": "sha256-tL+b6WC4gJJSo6wjNVIZpQ0DsYg8RmoGHxYuk6jJKbU=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "4e785d12a91117cd5b255052799d1a051d9976c0",
|
"rev": "150d693fe794a01aab762a18d2d8a2c8bc54b43c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -445,11 +565,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753622892,
|
"lastModified": 1756810301,
|
||||||
"narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=",
|
"narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809",
|
"rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -508,19 +628,23 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"k9s-config": {
|
"minimal-tmux": {
|
||||||
"flake": false,
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756976593,
|
"lastModified": 1748977843,
|
||||||
"narHash": "sha256-yE1S4hsfy8NlPRZKuezgHyHqZo5nIqf6y42us6vcA4Y=",
|
"narHash": "sha256-0gXtFVan+Urb79AjFOjHdjl3Q73m8M3wFSo3ZhjxcBA=",
|
||||||
"owner": "fwastring",
|
"owner": "niksingh710",
|
||||||
"repo": "k9s",
|
"repo": "minimal-tmux-status",
|
||||||
"rev": "21df095f01accd28ae1bf86b997b47301096f580",
|
"rev": "de2bb049a743e0f05c08531a0461f7f81da0fc72",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "fwastring",
|
"owner": "niksingh710",
|
||||||
"repo": "k9s",
|
"repo": "minimal-tmux-status",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -535,11 +659,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757117124,
|
"lastModified": 1757376306,
|
||||||
"narHash": "sha256-ZUnJehqxYrhfvIdLrFC3l/w8pX4ObEIWZYqL1UpgvRE=",
|
"narHash": "sha256-xZ9agpXP92762wo6pEZd1gs1jJEjrd4WWGtzlpY3QaA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "neovim-nightly-overlay",
|
"repo": "neovim-nightly-overlay",
|
||||||
"rev": "b447e494cafb7adaf396714a285245e4d1536a6a",
|
"rev": "b142f8f6336853ff325fe39c9f658e51e42c781b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -551,11 +675,11 @@
|
||||||
"neovim-src": {
|
"neovim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757081548,
|
"lastModified": 1757369388,
|
||||||
"narHash": "sha256-24Jg5pMGTofEJ6Pz6OBDAMH6hc9gbMqgZhhVe+uZF3M=",
|
"narHash": "sha256-nLc2Oi6N2DfZTVBl8plpSlx13DQGc087ziWymAyjkOI=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "069be911064d0e64f1efc13348dbb878afaf347f",
|
"rev": "acb99b8a6572d8ea8d917955a653945550923be0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -566,27 +690,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756266583,
|
"lastModified": 1757068644,
|
||||||
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=",
|
"narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2",
|
"rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-unstable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1756787288,
|
|
||||||
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -598,11 +706,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756911493,
|
"lastModified": 1757034884,
|
||||||
"narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=",
|
"narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c6a788f552b7b7af703b1a29802a7233c0067908",
|
"rev": "ca77296380960cd497a765102eeb1356eb80fed0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -614,33 +722,42 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757020766,
|
"lastModified": 1757347588,
|
||||||
"narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=",
|
"narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a",
|
"rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nvim-config": {
|
"nur": {
|
||||||
"flake": false,
|
"inputs": {
|
||||||
|
"flake-parts": [
|
||||||
|
"stylix",
|
||||||
|
"flake-parts"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"stylix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756970481,
|
"lastModified": 1756961635,
|
||||||
"narHash": "sha256-mfUYGgb81Lw18h5mvlyv0eAUe8Zoj0dKsXqHodKgBsE=",
|
"narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=",
|
||||||
"owner": "fwastring",
|
"owner": "nix-community",
|
||||||
"repo": "nvim",
|
"repo": "NUR",
|
||||||
"rev": "e8fe294a0c3f16a2cb898e4bec6ef34998e14424",
|
"rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "fwastring",
|
"owner": "nix-community",
|
||||||
"repo": "nvim",
|
"repo": "NUR",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -654,11 +771,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755960406,
|
"lastModified": 1757239681,
|
||||||
"narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=",
|
"narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
|
"rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -669,14 +786,46 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"fw-pkgs": "fw-pkgs",
|
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"k9s-config": "k9s-config",
|
"minimal-tmux": "minimal-tmux",
|
||||||
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"stylix": "stylix"
|
||||||
"nvim-config": "nvim-config"
|
}
|
||||||
|
},
|
||||||
|
"stylix": {
|
||||||
|
"inputs": {
|
||||||
|
"base16": "base16",
|
||||||
|
"base16-fish": "base16-fish",
|
||||||
|
"base16-helix": "base16-helix",
|
||||||
|
"base16-vim": "base16-vim",
|
||||||
|
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||||
|
"flake-parts": "flake-parts_3",
|
||||||
|
"gnome-shell": "gnome-shell",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nur": "nur",
|
||||||
|
"systems": "systems_2",
|
||||||
|
"tinted-foot": "tinted-foot",
|
||||||
|
"tinted-kitty": "tinted-kitty",
|
||||||
|
"tinted-schemes": "tinted-schemes",
|
||||||
|
"tinted-tmux": "tinted-tmux",
|
||||||
|
"tinted-zed": "tinted-zed"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1757360005,
|
||||||
|
"narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "stylix",
|
||||||
|
"rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "stylix",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
@ -694,6 +843,102 @@
|
||||||
"type": "github"
|
"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"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tinted-foot": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1726913040,
|
||||||
|
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "tinted-foot",
|
||||||
|
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "tinted-foot",
|
||||||
|
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tinted-kitty": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735730497,
|
||||||
|
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "tinted-kitty",
|
||||||
|
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "tinted-kitty",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tinted-schemes": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1754779259,
|
||||||
|
"narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "schemes",
|
||||||
|
"rev": "097d751b9e3c8b97ce158e7d141e5a292545b502",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "schemes",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tinted-tmux": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1754788770,
|
||||||
|
"narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "tinted-tmux",
|
||||||
|
"rev": "fb2175accef8935f6955503ec9dd3c973eec385c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "tinted-tmux",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tinted-zed": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1755613540,
|
||||||
|
"narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "base16-zed",
|
||||||
|
"rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "base16-zed",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
72
flake.nix
72
flake.nix
|
@ -3,24 +3,25 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# Nixpkgs
|
# Nixpkgs
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
stylix = {
|
||||||
fw-pkgs.url = "github:fwastring/fwpkgs/main";
|
url = "github:nix-community/stylix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
# fw-pkgs.url = "github:fwastring/fwpkgs/main";
|
||||||
|
|
||||||
# Neovim
|
# Neovim
|
||||||
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
home-manager.url = "github:nix-community/home-manager/release-25.05";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nvim-config = {
|
|
||||||
url = "github:fwastring/nvim?exportIgnore=1";
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
flake = false;
|
|
||||||
};
|
minimal-tmux = {
|
||||||
k9s-config = {
|
url = "github:niksingh710/minimal-tmux-status";
|
||||||
url = "github:fwastring/k9s?exportIgnore=1";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
flake = false;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -29,25 +30,18 @@
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
home-manager,
|
home-manager,
|
||||||
nixpkgs-unstable,
|
stylix,
|
||||||
fw-pkgs,
|
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
overlay-unstable = final: prev: {
|
# overlay-fw-pkgs = final: prev: {
|
||||||
unstable = import nixpkgs-unstable {
|
# fw-pkgs = import fw-pkgs {
|
||||||
inherit system;
|
# inherit system;
|
||||||
config.allowUnfree = true;
|
# config.allowUnfree = false;
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
overlay-fw-pkgs = final: prev: {
|
|
||||||
fw-pkgs = import fw-pkgs {
|
|
||||||
inherit system;
|
|
||||||
config.allowUnfree = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# NixOS configuration entrypoint
|
# NixOS configuration entrypoint
|
||||||
|
@ -59,12 +53,6 @@
|
||||||
myhostname = "laptop";
|
myhostname = "laptop";
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
(
|
|
||||||
{ nixpkgs, ... }:
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = [ overlay-unstable overlay-fw-pkgs ];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
./maskiner/laptop/configuration.nix
|
./maskiner/laptop/configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -74,12 +62,6 @@
|
||||||
myhostname = "desktop";
|
myhostname = "desktop";
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
(
|
|
||||||
{ nixpkgs, ... }:
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = [ overlay-unstable ];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
./maskiner/desktop/configuration.nix
|
./maskiner/desktop/configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -89,13 +71,9 @@
|
||||||
myhostname = "jobb";
|
myhostname = "jobb";
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
(
|
|
||||||
{ nixpkgs, ... }:
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = [ overlay-unstable overlay-fw-pkgs ];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
./maskiner/jobb/configuration.nix
|
./maskiner/jobb/configuration.nix
|
||||||
|
stylix.nixosModules.stylix
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
work-desktop = nixpkgs.lib.nixosSystem {
|
work-desktop = nixpkgs.lib.nixosSystem {
|
||||||
|
@ -104,12 +82,6 @@
|
||||||
myhostname = "work-desktop";
|
myhostname = "work-desktop";
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
(
|
|
||||||
{ nixpkgs, ... }:
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = [ overlay-unstable ];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
./maskiner/work-desktop/configuration.nix
|
./maskiner/work-desktop/configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
1
keys/desktop_rsa_pubkey
Normal file
1
keys/desktop_rsa_pubkey
Normal file
|
@ -0,0 +1 @@
|
||||||
|
AAAAB3NzaC1yc2EAAAADAQABAAACAQDhzOL/NsSlwUkgo6TVQfffHw4ysJU/+XMUNKyab1RCAhCEw74k7s7sCckW0KuZy05ZtINuyGK3dnajVO+FnyfjVRtqR7WOpJqlp917Q13ODgUReJeYSILtGR5mFnSAXUr+mp2xdFx+TJqoCxdzEm2E0VRBZYugYYwbM1LL5gBKGi7OJg+JYwuexRGAzFST68UAU8QME9Z3nLpBl4PnVdatmYxq4TXrHzvj6OeyxohzpbxCMbymqa+lb1C0MCUB8tRDub6+GRhLYhUh2WpYTCgAUc4BCZONLn/ZLn6+kAn1C0Vu8pKvwgviIVXpffq+pNTufE9RMPQ1gt+IWbk4vNsBIYj3ubn+BB+BfD7oQMUwXPktM7qh9AHz0nrA9l6x9aix8SfeMZ/ZewP/CXwQ/hk9Tozu1wVXy6BFSvz43P3o7BUcrQg5LjyU++YfWyzLMtw4btMzEJV1Nt7zDJvDAbepoNSQbIcKUFa1QDH4mQ9apszb3iJGmEWCOv2SjPZ3+6+op6TmT80FTttg7GVQ33l+bA1N46b8gy1wIBWEHZNh8ZH5tcSxM6u0iDuwNpsSUIPXRyJD/2Dv7uK1JP45aW0NxxsILLwuJtxvi08MrCvYyIT9J61qRmy5UGaOkI1qGCIOg2lJXv3t5E52KMA7leXIacfN/8Orm0kEdw4eY5ezPw==
|
1
keys/id_ed25519.pub
Normal file
1
keys/id_ed25519.pub
Normal file
|
@ -0,0 +1 @@
|
||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII60tdNsG0z9q2jHmoTKvkeLQE6OF0bmTsDX1bpqpoG7 fw@jobb
|
|
@ -23,8 +23,6 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
unstable.lego
|
|
||||||
k9s
|
|
||||||
neovim
|
neovim
|
||||||
git
|
git
|
||||||
];
|
];
|
||||||
|
@ -76,9 +74,6 @@ users.users.root.openssh.authorizedKeys.keys = [
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# services.tailscale.enable = true;
|
|
||||||
# services.tailscale.package = pkgs.unstable.tailscale;
|
|
||||||
|
|
||||||
networking.hostName = myhostname;
|
networking.hostName = myhostname;
|
||||||
|
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
|
|
|
@ -18,7 +18,6 @@ in
|
||||||
|
|
||||||
../../moduler/base.nix
|
../../moduler/base.nix
|
||||||
|
|
||||||
inputs.home-manager.nixosModules.home-manager
|
|
||||||
../../moduler/users.nix
|
../../moduler/users.nix
|
||||||
../../moduler/network.nix
|
../../moduler/network.nix
|
||||||
../../moduler/programs.nix
|
../../moduler/programs.nix
|
||||||
|
@ -29,11 +28,25 @@ in
|
||||||
../../moduler/sound.nix
|
../../moduler/sound.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
stylix = {
|
||||||
|
enable = true;
|
||||||
|
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml";
|
||||||
|
};
|
||||||
|
|
||||||
home-manager.extraSpecialArgs = { inherit inputs pkgs; };
|
home-manager.extraSpecialArgs = { inherit inputs pkgs; };
|
||||||
home-manager.users.fw = {
|
home-manager.users.fw = {
|
||||||
imports = [
|
imports = [
|
||||||
./../../moduler/home.nix
|
./../../moduler/home.nix
|
||||||
];
|
];
|
||||||
|
programs.ranger.enable = true;
|
||||||
|
stylix.targets = {
|
||||||
|
lazygit.enable = false;
|
||||||
|
fish.enable = false;
|
||||||
|
kitty.enable = false;
|
||||||
|
waybar.enable = false;
|
||||||
|
tmux.enable = false;
|
||||||
|
k9s.enable = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
@ -42,27 +55,12 @@ in
|
||||||
patches = [ ../../moduler/btusb-add-mt7925.patch ];
|
patches = [ ../../moduler/btusb-add-mt7925.patch ];
|
||||||
}))
|
}))
|
||||||
];
|
];
|
||||||
hardware.enableRedistributableFirmware = true;
|
|
||||||
|
|
||||||
networking.hostName = myhostname;
|
networking.hostName = myhostname;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
gonic
|
|
||||||
];
|
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
tailscale = {
|
tailscale = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.unstable.tailscale;
|
|
||||||
};
|
|
||||||
searx = {
|
|
||||||
enable = true;
|
|
||||||
redisCreateLocally = true;
|
|
||||||
settings.server = {
|
|
||||||
bind_address = "::1";
|
|
||||||
port = 8000;
|
|
||||||
secret_key = "alsjdioefj.asdi";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@ in
|
||||||
services = {
|
services = {
|
||||||
tailscale = {
|
tailscale = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.unstable.tailscale;
|
|
||||||
};
|
};
|
||||||
searx = {
|
searx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
unstable.lego
|
lego
|
||||||
];
|
];
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -46,7 +46,7 @@ in
|
||||||
python314
|
python314
|
||||||
|
|
||||||
awscli
|
awscli
|
||||||
unstable.minio-client
|
minio-client
|
||||||
hugo
|
hugo
|
||||||
sqlc
|
sqlc
|
||||||
postgresql
|
postgresql
|
||||||
|
|
|
@ -15,11 +15,11 @@
|
||||||
frame_color = "#eceff1";
|
frame_color = "#eceff1";
|
||||||
corner_radius = 10;
|
corner_radius = 10;
|
||||||
};
|
};
|
||||||
urgency_normal = {
|
# urgency_normal = {
|
||||||
background = "#181818";
|
# background = "#181818";
|
||||||
foreground = "#dfdfdf";
|
# foreground = "#dfdfdf";
|
||||||
timeout = 10;
|
# timeout = 10;
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
../moduler/oh-my-posh.nix
|
../moduler/oh-my-posh.nix
|
||||||
../moduler/gtk.nix
|
../moduler/gtk.nix
|
||||||
# ../moduler/neovim.nix
|
# ../moduler/neovim.nix
|
||||||
../moduler/k9s.nix
|
../moduler/k9s
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
host,
|
host,
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
|
@ -21,9 +22,7 @@ in
|
||||||
wmenu
|
wmenu
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
gnome.gnome-keyring.enable = true;
|
|
||||||
greetd = {
|
greetd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
@ -49,13 +48,146 @@ in
|
||||||
home-manager.users.fw =
|
home-manager.users.fw =
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
./waybar.nix
|
|
||||||
];
|
|
||||||
programs = {
|
programs = {
|
||||||
hyprlock = {
|
hyprlock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
rofi = {
|
||||||
|
enable = true;
|
||||||
|
font = lib.mkForce "ComicShannsMono Nerd Font 18";
|
||||||
|
};
|
||||||
|
waybar = {
|
||||||
|
enable = true;
|
||||||
|
systemd = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
settings = {
|
||||||
|
mainBar = {
|
||||||
|
modules-left = [
|
||||||
|
"hyprland/workspaces"
|
||||||
|
];
|
||||||
|
modules-right = [
|
||||||
|
"tray"
|
||||||
|
"clock"
|
||||||
|
];
|
||||||
|
"custom/arrow1" = {
|
||||||
|
format = "";
|
||||||
|
|
||||||
|
};
|
||||||
|
tray = {
|
||||||
|
format = "<span>{icon}</span>";
|
||||||
|
"icon-size" = 14;
|
||||||
|
spacing = 5;
|
||||||
|
};
|
||||||
|
|
||||||
|
clock = {
|
||||||
|
format = "<span> </span><span>{:%c}</span>";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
style = ''
|
||||||
|
@define-color bg #eff1f5;
|
||||||
|
@define-color fg #4c4f69;
|
||||||
|
@define-color lbg #e6e9ef;
|
||||||
|
@define-color yellow #df8e1d;
|
||||||
|
@define-color lavender #7287fd;
|
||||||
|
@define-color peach #fe640b;
|
||||||
|
@define-color red #d20f39;
|
||||||
|
@define-color green #40a02b;
|
||||||
|
@define-color blue #1e66f5;
|
||||||
|
@define-color border #dce0e8;
|
||||||
|
|
||||||
|
* {
|
||||||
|
min-height: 0;
|
||||||
|
margin: 0px 0px 0px 0px;
|
||||||
|
padding: 0;
|
||||||
|
border-radius: 7px;
|
||||||
|
font-family: "ComicShannsMono Nerd Font";
|
||||||
|
font-size: 14pt;
|
||||||
|
font-weight: 700;
|
||||||
|
padding-bottom: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
tooltip {
|
||||||
|
background: @bg;
|
||||||
|
border-radius: 7px;
|
||||||
|
border: 2px solid @border;
|
||||||
|
}
|
||||||
|
|
||||||
|
#window {
|
||||||
|
margin: 0px 0px 0px 0px;
|
||||||
|
padding-left: 10px;
|
||||||
|
padding-right: 7px;
|
||||||
|
border-radius: 3px;
|
||||||
|
border-color: @lbg;
|
||||||
|
background-color: @yellow;
|
||||||
|
color: @bg;
|
||||||
|
}
|
||||||
|
|
||||||
|
window#waybar.empty #window {
|
||||||
|
background-color: @bg;
|
||||||
|
border-bottom: none;
|
||||||
|
border-right: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
window#waybar {
|
||||||
|
background-color: @bg;
|
||||||
|
color: @lavender;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Workspaces */
|
||||||
|
@keyframes button_activate {
|
||||||
|
from { opacity: .3 }
|
||||||
|
to { opacity: 1.; }
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces {
|
||||||
|
margin: 0px 0px 0px 0px;
|
||||||
|
border-radius: 3px;
|
||||||
|
padding: 1px;
|
||||||
|
background-color: @bg;
|
||||||
|
color: @bg;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button {
|
||||||
|
margin: 0px 0px 0px 0px;
|
||||||
|
border-radius: 3px;
|
||||||
|
padding-left: 3px;
|
||||||
|
padding-right: 9px;
|
||||||
|
background-color: @bg;
|
||||||
|
color: @fg;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.active {
|
||||||
|
background-color:@blue;
|
||||||
|
color: @bg;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.urgent {
|
||||||
|
color: #F38BA8;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button:hover {
|
||||||
|
border: solid transparent;
|
||||||
|
}
|
||||||
|
#tray {
|
||||||
|
margin: 0px 0px 0px 0px;
|
||||||
|
border-radius: 3px;
|
||||||
|
padding-left: 10px;
|
||||||
|
padding-right: 10px;
|
||||||
|
background-color: @bg;
|
||||||
|
color: @fg;
|
||||||
|
}
|
||||||
|
#clock {
|
||||||
|
margin: 0px 0px 0px 0px;
|
||||||
|
padding-left: 10px;
|
||||||
|
padding-right: 10px;
|
||||||
|
border-radius: 3px;
|
||||||
|
color: @bg;
|
||||||
|
background-color: @green;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
cliphist = {
|
cliphist = {
|
||||||
|
@ -267,7 +399,7 @@ in
|
||||||
|
|
||||||
# Applications
|
# Applications
|
||||||
"$mod, q, exec, ${pkgs.firefox}/bin/firefox"
|
"$mod, q, exec, ${pkgs.firefox}/bin/firefox"
|
||||||
"$mod, d, exec, ${pkgs.rofi}/bin/rofi -show run"
|
"$mod, d, exec, ${pkgs.rofi}/bin/rofi -show drun"
|
||||||
|
|
||||||
# Screencapture
|
# Screencapture
|
||||||
"$mod, S, exec, ${pkgs.grim}/bin/grim | wl-copy"
|
"$mod, S, exec, ${pkgs.grim}/bin/grim | wl-copy"
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
{ config, inputs, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
in
|
|
||||||
{
|
|
||||||
programs.k9s.enable = true;
|
|
||||||
|
|
||||||
xdg.configFile."k9s".source = inputs.k9s-config;
|
|
||||||
|
|
||||||
}
|
|
20
moduler/k9s/default.nix
Normal file
20
moduler/k9s/default.nix
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
in
|
||||||
|
{
|
||||||
|
programs.k9s = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
k9s.ui.skin = "catppuccin-latte";
|
||||||
|
};
|
||||||
|
skins = {
|
||||||
|
catppuccin-latte = ./latte-transparent.yml;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
100
moduler/k9s/latte-transparent.yml
Normal file
100
moduler/k9s/latte-transparent.yml
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
k9s:
|
||||||
|
body:
|
||||||
|
fgColor: '#4c4f69'
|
||||||
|
bgColor: default
|
||||||
|
logoColor: '#8839ef'
|
||||||
|
prompt:
|
||||||
|
fgColor: '#4c4f69'
|
||||||
|
bgColor: default
|
||||||
|
suggestColor: '#1e66f5'
|
||||||
|
help:
|
||||||
|
fgColor: '#4c4f69'
|
||||||
|
bgColor: default
|
||||||
|
sectionColor: '#40a02b'
|
||||||
|
keyColor: '#1e66f5'
|
||||||
|
numKeyColor: '#e64553'
|
||||||
|
frame:
|
||||||
|
title:
|
||||||
|
fgColor: '#179299'
|
||||||
|
bgColor: default
|
||||||
|
highlightColor: '#ea76cb'
|
||||||
|
counterColor: '#df8e1d'
|
||||||
|
filterColor: '#40a02b'
|
||||||
|
border:
|
||||||
|
fgColor: '#8839ef'
|
||||||
|
focusColor: '#7287fd'
|
||||||
|
menu:
|
||||||
|
fgColor: '#4c4f69'
|
||||||
|
keyColor: '#1e66f5'
|
||||||
|
numKeyColor: '#e64553'
|
||||||
|
crumbs:
|
||||||
|
fgColor: '#eff1f5'
|
||||||
|
bgColor: default
|
||||||
|
activeColor: '#dd7878'
|
||||||
|
status:
|
||||||
|
newColor: '#1e66f5'
|
||||||
|
modifyColor: '#7287fd'
|
||||||
|
addColor: '#40a02b'
|
||||||
|
pendingColor: '#fe640b'
|
||||||
|
errorColor: '#d20f39'
|
||||||
|
highlightColor: '#04a5e5'
|
||||||
|
killColor: '#8839ef'
|
||||||
|
completedColor: '#9ca0b0'
|
||||||
|
info:
|
||||||
|
fgColor: '#fe640b'
|
||||||
|
sectionColor: '#4c4f69'
|
||||||
|
views:
|
||||||
|
table:
|
||||||
|
fgColor: '#4c4f69'
|
||||||
|
bgColor: default
|
||||||
|
cursorFgColor: '#ccd0da'
|
||||||
|
cursorBgColor: '#bcc0cc'
|
||||||
|
markColor: '#dc8a78'
|
||||||
|
header:
|
||||||
|
fgColor: '#df8e1d'
|
||||||
|
bgColor: default
|
||||||
|
sorterColor: '#04a5e5'
|
||||||
|
xray:
|
||||||
|
fgColor: '#4c4f69'
|
||||||
|
bgColor: default
|
||||||
|
cursorColor: '#bcc0cc'
|
||||||
|
cursorTextColor: '#eff1f5'
|
||||||
|
graphicColor: '#ea76cb'
|
||||||
|
charts:
|
||||||
|
bgColor: default
|
||||||
|
chartBgColor: default
|
||||||
|
dialBgColor: default
|
||||||
|
defaultDialColors:
|
||||||
|
- '#40a02b'
|
||||||
|
- '#d20f39'
|
||||||
|
defaultChartColors:
|
||||||
|
- '#40a02b'
|
||||||
|
- '#d20f39'
|
||||||
|
resourceColors:
|
||||||
|
cpu:
|
||||||
|
- '#8839ef'
|
||||||
|
- '#1e66f5'
|
||||||
|
mem:
|
||||||
|
- '#df8e1d'
|
||||||
|
- '#fe640b'
|
||||||
|
yaml:
|
||||||
|
keyColor: '#1e66f5'
|
||||||
|
valueColor: '#4c4f69'
|
||||||
|
colonColor: '#6c6f85'
|
||||||
|
logs:
|
||||||
|
fgColor: '#4c4f69'
|
||||||
|
bgColor: default
|
||||||
|
indicator:
|
||||||
|
fgColor: '#7287fd'
|
||||||
|
bgColor: default
|
||||||
|
toggleOnColor: '#40a02b'
|
||||||
|
toggleOffColor: '#6c6f85'
|
||||||
|
dialog:
|
||||||
|
fgColor: '#df8e1d'
|
||||||
|
bgColor: default
|
||||||
|
buttonFgColor: '#eff1f5'
|
||||||
|
buttonBgColor: default
|
||||||
|
buttonFocusFgColor: '#eff1f5'
|
||||||
|
buttonFocusBgColor: '#ea76cb'
|
||||||
|
labelFgColor: '#dc8a78'
|
||||||
|
fieldFgColor: '#4c4f69'
|
|
@ -9,7 +9,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
font = {
|
font = {
|
||||||
name = "ComicShannsMono Nerd Font";
|
name = "ComicShannsMono Nerd Font";
|
||||||
size = 12;
|
size = 14;
|
||||||
};
|
};
|
||||||
shellIntegration = {
|
shellIntegration = {
|
||||||
mode = "no-cursor";
|
mode = "no-cursor";
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
cursor_shape = "block";
|
cursor_shape = "block";
|
||||||
cursor_blink_interval = 0;
|
cursor_blink_interval = 0;
|
||||||
enable_audio_bell = false;
|
enable_audio_bell = false;
|
||||||
window_padding_width = 5;
|
window_padding_width = 10;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
}: {
|
}: {
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
unstable.nixd
|
nixd
|
||||||
gopls
|
gopls
|
||||||
inputs.neovim-nightly-overlay.packages.${pkgs.system}.default
|
inputs.neovim-nightly-overlay.packages.${pkgs.system}.default
|
||||||
omnisharp-roslyn
|
omnisharp-roslyn
|
||||||
|
|
|
@ -7,7 +7,7 @@ in
|
||||||
# programs.neovim.enable = true;
|
# programs.neovim.enable = true;
|
||||||
|
|
||||||
# Create a symlink from the Nix store to the Neovim config directory
|
# Create a symlink from the Nix store to the Neovim config directory
|
||||||
xdg.configFile."nvim".source = inputs.nvim-config;
|
# xdg.configFile."nvim".source = inputs.nvim-config;
|
||||||
|
|
||||||
# Other Home Manager options...
|
# Other Home Manager options...
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
services.netbird = {
|
services.netbird = {
|
||||||
enable = true;
|
enable = true;
|
||||||
ui.enable = true;
|
ui.enable = true;
|
||||||
package = pkgs.unstable.netbird;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# GUI
|
# GUI
|
||||||
unstable.feishin
|
feishin
|
||||||
unstable.signal-desktop
|
signal-desktop
|
||||||
thunderbird
|
thunderbird
|
||||||
libreoffice
|
libreoffice
|
||||||
discord
|
discord
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
alsa.support32Bit = true;
|
alsa.support32Bit = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
systemWide = true;
|
|
||||||
};
|
};
|
||||||
blueman.enable = true;
|
blueman.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,6 +2,13 @@
|
||||||
{
|
{
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
knownHosts = {
|
||||||
|
desktop = {
|
||||||
|
extraHostNames = [ "192.168.1.227" ];
|
||||||
|
publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"lth" = {
|
"lth" = {
|
||||||
hostname = "login.student.lth.se";
|
hostname = "login.student.lth.se";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
{
|
{
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -11,14 +11,7 @@
|
||||||
plugins = with pkgs; [
|
plugins = with pkgs; [
|
||||||
tmuxPlugins.sensible
|
tmuxPlugins.sensible
|
||||||
tmuxPlugins.pain-control
|
tmuxPlugins.pain-control
|
||||||
tmuxPlugins.sessionist
|
{ plugin = inputs.minimal-tmux.packages.${pkgs.system}.default; }
|
||||||
{
|
|
||||||
plugin = fw-pkgs.tmuxPlugins.minimal;
|
|
||||||
extraConfig = ''
|
|
||||||
bind-key b set-option status
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
||||||
];
|
];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set -g set-clipboard on
|
set -g set-clipboard on
|
||||||
|
|
|
@ -1,166 +0,0 @@
|
||||||
{
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
programs.waybar = {
|
|
||||||
enable = true;
|
|
||||||
systemd.enable = true;
|
|
||||||
settings = {
|
|
||||||
mainBar = {
|
|
||||||
layer = "top";
|
|
||||||
"modules-left" = [
|
|
||||||
"hyprland/workspaces"
|
|
||||||
];
|
|
||||||
"modules-right" = [
|
|
||||||
"tray"
|
|
||||||
"clock"
|
|
||||||
"pulseaudio"
|
|
||||||
"bluetooth"
|
|
||||||
];
|
|
||||||
"hyprland/window" = {
|
|
||||||
format = "{title}";
|
|
||||||
"max-length" = 333;
|
|
||||||
"seperate-outputs" = true;
|
|
||||||
};
|
|
||||||
clock = {
|
|
||||||
format = "<span>{:%c}</span>";
|
|
||||||
"tooltip-format" = "{calendar}";
|
|
||||||
calendar = {
|
|
||||||
mode = "month";
|
|
||||||
"mode-mon-col" = 3;
|
|
||||||
"on-scroll" = 1;
|
|
||||||
"on-click-right" = "mode";
|
|
||||||
format = {
|
|
||||||
months = "<span color='#ffead3'><b>{}</b></span>";
|
|
||||||
days = "<span color='#ecc6d9'><b>{}</b></span>";
|
|
||||||
weeks = "<span color='#99ffdd'><b>{%W}</b></span>";
|
|
||||||
weekdays = "<span color='#ffcc66'><b>{}</b></span>";
|
|
||||||
today = "<span color='#ff6699'><b>{}</b></span>";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
actions = {
|
|
||||||
"on-click-middle" = "mode";
|
|
||||||
"on-click-right" = "shift_up";
|
|
||||||
"on-click" = "shift_down";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
cpu = {
|
|
||||||
format = "<span foreground='#b8bb26'></span> {usage}%";
|
|
||||||
};
|
|
||||||
memory = {
|
|
||||||
format = "<span foreground='#d65d9e'></span> {}%";
|
|
||||||
interval = 1;
|
|
||||||
};
|
|
||||||
"hyprland/workspaces" = {
|
|
||||||
format = "{icon}";
|
|
||||||
"active-only" = false;
|
|
||||||
"sort-by-number" = true;
|
|
||||||
"on-click" = "activate";
|
|
||||||
"all-outputs" = false;
|
|
||||||
"format-icons" = {
|
|
||||||
"1" = "1";
|
|
||||||
"2" = "2";
|
|
||||||
"3" = "3";
|
|
||||||
"4" = "4";
|
|
||||||
"5" = "5";
|
|
||||||
"6" = "6";
|
|
||||||
"7" = "7";
|
|
||||||
"8" = "8";
|
|
||||||
"9" = "9";
|
|
||||||
"10" = "10";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
network = {
|
|
||||||
format = " Off";
|
|
||||||
"format-wifi" = "{essid} ({signalStrength}%)";
|
|
||||||
"format-ethernet" = "<span foreground='#b48ead'></span>";
|
|
||||||
"format-disconnected" = " Disconnected";
|
|
||||||
"tooltip-format" = "{ifname} via {gwaddr} ";
|
|
||||||
"tooltip-format-wifi" = "{essid}({signalStrength}%) ";
|
|
||||||
"tooltip-format-ethernet" = " {ifname}";
|
|
||||||
"tooltip-format-disconnected" = "Disconnected";
|
|
||||||
};
|
|
||||||
pulseaudio = {
|
|
||||||
format = "<span foreground='#cc241d'>{icon}</span> {volume}% {format_source}";
|
|
||||||
"format-bluetooth" = "<span foreground='#b16286'>{icon}</span> {volume}% {format_source}";
|
|
||||||
"format-bluetooth-muted" = "<span foreground='#D699B6'></span> {format_source}";
|
|
||||||
"format-muted" = "<span foreground='#7A8478'></span> {format_source}";
|
|
||||||
"format-source" = "<span foreground='#E67E80'></span> {volume}%";
|
|
||||||
"format-source-muted" = "<span foreground='#F38BA8'></span>";
|
|
||||||
"format-icons" = {
|
|
||||||
headphone = "";
|
|
||||||
phone = "";
|
|
||||||
portable = "";
|
|
||||||
default = [
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
];
|
|
||||||
};
|
|
||||||
"on-click-left" = "pavucontrol";
|
|
||||||
input = true;
|
|
||||||
};
|
|
||||||
"custom/playerctl" = {
|
|
||||||
format = "{icon} <span>{}</span>";
|
|
||||||
"return-type" = "json";
|
|
||||||
"max-length" = 333;
|
|
||||||
exec = "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F";
|
|
||||||
"on-click-middle" = "playerctl play-pause";
|
|
||||||
"on-click" = "playerctl previous";
|
|
||||||
"on-click-right" = "playerctl next";
|
|
||||||
"format-icons" = {
|
|
||||||
Playing = "<span foreground='#98BB6C'></span>";
|
|
||||||
Paused = "<span foreground='#E46876'></span>";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
tray = {
|
|
||||||
format = "<span foreground='#D3C6AA'>{icon}</span>";
|
|
||||||
"icon-size" = 14;
|
|
||||||
spacing = 5;
|
|
||||||
};
|
|
||||||
idle_inhibitor = {
|
|
||||||
format = "{icon}";
|
|
||||||
"format-icons" = {
|
|
||||||
activated = "";
|
|
||||||
deactivated = "";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
"custom/subs" = {
|
|
||||||
format = "<span foreground='#fbf1c7'> </span> {}";
|
|
||||||
exec = "/usr/local/bin/subsfile.sh";
|
|
||||||
"on-click" = "vivaldi-stable https://youtube.com/thelinuxcast";
|
|
||||||
"restart-interval" = 1;
|
|
||||||
};
|
|
||||||
"custom/spacer" = {
|
|
||||||
format = " ";
|
|
||||||
};
|
|
||||||
"wlr/taskbar" = {
|
|
||||||
format = "{name}";
|
|
||||||
"icon-size" = 14;
|
|
||||||
"icon-theme" = "Numix-Circle";
|
|
||||||
"tooltip-format" = "{title}";
|
|
||||||
"on-click" = "activate";
|
|
||||||
"on-click-middle" = "close";
|
|
||||||
"ignore-list" = [ "Alacritty" ];
|
|
||||||
"app_ids-mapping" = {
|
|
||||||
firefoxdeveloperedition = "firefox-developer-edition";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
bluetooth = {
|
|
||||||
"on-click" = "./scripts/bluetooth-control";
|
|
||||||
"on-click-right" = "./scripts/rofi-bluetooth";
|
|
||||||
"on-click-middle" = "./scripts/rofi-bluetooth";
|
|
||||||
format = "{icon}";
|
|
||||||
interval = 15;
|
|
||||||
"format-icons" = {
|
|
||||||
on = "<span foreground='#43242B'></span>";
|
|
||||||
off = "<span foreground='#76946A'></span>";
|
|
||||||
disabled = "";
|
|
||||||
connected = "";
|
|
||||||
};
|
|
||||||
"tooltip-format" = "{device_alias} {status}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue