Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pull swaymux

Browse source
This commit is contained in:
LordGrimmauld 2024-03-09 18:24:55 +01:00
parent dd69b17a01
commit a0eaee343f
8 changed files with 81 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
flake.lock
View file

@ -4,7 +4,9 @@
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems"
},
"locked": {
@ -69,16 +71,18 @@
"jujutsu": "jujutsu",
"niri": "niri",
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs_2",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2",
"yafas": "yafas"
},
"locked": {
"lastModified": 1709644541,
"narHash": "sha256-TW6967KZlypDNOsOsBrs89uC62aYAJbTqJsCgY6Gl0I=",
"lastModified": 1709828095,
"narHash": "sha256-subJqhj34TJ00C0qbGPUkozt4nMNi5DZltw/i4xmgVE=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "c3c71b0be6d5f2f787db499d77cdac8692eda57b",
"rev": "9b54befbe7993ed2abe91f4d76e259b3e8f9d922",
"type": "github"
},
"original": {
@ -343,11 +347,11 @@
]
},
"locked": {
"lastModified": 1709295149,
"narHash": "sha256-+blV8vKyvh3gYnUFYTOu2yuWxEEBqwS7hfLm6qdpoe4=",
"lastModified": 1709744297,
"narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "0ef51034dcc8b65b8be72eedd0d5db7d426ea054",
"rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f",
"type": "github"
},
"original": {
@ -369,11 +373,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1709486703,
"narHash": "sha256-AIDAnQja0/2YsZb6Rxa//gH9uV0QmVs/vsVXj2DAd7s=",
"lastModified": 1709786138,
"narHash": "sha256-yppQIffjpyQ2nqhiZbV2pSMQJx8srmHjAk+UClCQfRw=",
"owner": "martinvonz",
"repo": "jj",
"rev": "415ae5c0f9ed4d45df564a4aca6d327485a445bf",
"rev": "bf76080f42f77cad934d9a5202c7b7d29ab2c890",
"type": "github"
},
"original": {
@ -406,11 +410,11 @@
]
},
"locked": {
"lastModified": 1709481412,
"narHash": "sha256-QDRnTQQ9+4LIm+yhG7vFVs/NH3511nYLUW6PQXSamAw=",
"lastModified": 1709751999,
"narHash": "sha256-9I0bn0iSdYXHIPhU1Ne8Ooxfnut/qMtNDutBii9NxQE=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "2750b2038bed5495bcdfeacc7be25267d15ceab1",
"rev": "1a784e6e66785f360da6df59ae2fb4b98370ca3c",
"type": "github"
},
"original": {
@ -437,7 +441,9 @@
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_3"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1709428394,
@ -478,11 +484,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1703013332,
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"lastModified": 1709703039,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github"
},
"original": {
@ -526,59 +532,14 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"revCount": 591063,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.591063%2Brev-b8697e57f10292a6165a20f03d2f42920dfaf973/018e0b39-3c52-71b1-81e1-d90220875f22/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1709356872,
"narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "458b097d81f90275b3fdf03796f0563844926708",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"agenix": "agenix",
"chaotic": "chaotic",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_4",
"swayfx": "swayfx"
"nixpkgs": "nixpkgs",
"swayfx": "swayfx",
"swaymux": "swaymux"
}
},
"rust-analyzer-src": {
@ -646,6 +607,26 @@
"type": "github"
}
},
"swaymux": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1710004931,
"narHash": "sha256-0i6cLh3Mrgj7ZnQX68Fe66ozIXCFS7WjkKV5CL2EmCQ=",
"ref": "refs/heads/main",
"rev": "55384e0ceda36f7137203607179fc9b4ff85827f",
"revCount": 14,
"type": "git",
"url": "https://git.grimmauld.de/Grimmauld/swaymux"
},
"original": {
"type": "git",
"url": "https://git.grimmauld.de/Grimmauld/swaymux"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,

24
flake.nix
View file

@ -5,16 +5,29 @@
nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable";
};
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
agenix.url = "github:ryantm/agenix";
chaotic = {
url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};
swaymux = {
url = "git+https://git.grimmauld.de/Grimmauld/swaymux";
inputs.nixpkgs.follows = "nixpkgs";
};
swayfx = {
url = "github:WillPower3309/swayfx";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-gaming.url = "github:fufexan/nix-gaming";
nix-gaming = {
url = "github:fufexan/nix-gaming";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = inputs @ { self, agenix, nix-gaming, nixpkgs, chaotic, swayfx, ... }: let
outputs = inputs @ { self, agenix, nix-gaming, nixpkgs, chaotic, swayfx, swaymux, ... }: let
system = "x86_64-linux";
# pkg-overlays = import nixpkgs {
@ -28,12 +41,13 @@
nixosConfigurations = {
grimmauld-nixos = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit inputs; };
specialArgs = { inherit inputs system; };
modules = [
# ({ config, pkgs, ... }: { nixpkgs.overlays = [ (import ./overlay.nix {inherit inputs system;} ) ]; })
agenix.nixosModules.default
nix-gaming.nixosModules.pipewireLowLatency
chaotic.nixosModules.default
# swaymux.nixosModules.default
# ./kernel.nix
./configuration.nix
# ./modules/accessibility.nix

3
modules/fonts.nix
View file

@ -9,4 +9,7 @@
liberation_ttf
];
fonts.fontDir.enable = true;
environment.sessionVariables = {
FREETYPE_PROPERTIES="cff:no-stem-darkening=0 autofitter:no-stem-darkening=0";
};
}

4
modules/opengl.nix
View file

@ -16,4 +16,8 @@
# MESA_LOADER_DRIVER_OVERRIDE="zink";
# FLATPAK_GL_DRIVERS="mesa-git";
};
environment.systemPackages = with pkgs; [
glfw
];
}

6
modules/sway.nix
View file

@ -21,8 +21,9 @@
# });})
# ];
environment.systemPackages = with pkgs; [
kdePackages.breeze
environment.systemPackages = [
pkgs.kdePackages.breeze
inputs.swaymux.packages."${system}".default
];
qt = {
@ -30,7 +31,6 @@
style = "breeze";
platformTheme = "kde";
};
programs.sway = {
enable = true;

2
modules/toolchains.nix
View file

@ -102,7 +102,7 @@ in {
programs.ssh.startAgent = true;
programs.gnupg.agent = {
settings = {
default-cache-ttl = 6000;
# default-cache-ttl = 6000;
};
pinentryFlavor = "tty";
enable = true;

3
modules/tui.nix
View file

@ -2,11 +2,14 @@
environment.systemPackages = with pkgs; [
fbcat
gomuks
gotop
bluetuith
spotify-tui
ranger
alacritty
playerctl
pulseaudio
nix-search-cli
nixos-option
];
}

2
modules/users.nix
View file

@ -43,7 +43,7 @@
];
};
environment.systemPackages = with pkgs; [ pinentry-qt ];
# environment.systemPackages = with pkgs; [ pinentry-qt ];
programs.firefox = {
enable = true;