Compare commits

..

No commits in common. "3d8485d011090a2e25ee30631619eff318f6abed" and "2ddc486cf4c66c926b4dc4a69a540b2f59f37d4f" have entirely different histories.

5 changed files with 213 additions and 60 deletions

View file

@ -115,6 +115,10 @@
xkb.layout = "fr"; xkb.layout = "fr";
displayManager = { displayManager = {
lightdm.enable = false; lightdm.enable = false;
gdm = {
enable = true;
wayland = true;
};
}; };
}; };

View file

@ -37,11 +37,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725390774, "lastModified": 1724709327,
"narHash": "sha256-BvN26smRhC96D38Cd919v0rpb8/TwrojZYStPf0QyaQ=", "narHash": "sha256-7o2fSpUB8siBoCHoiXuojiBR/vZoIAfx4CqWyq2VfDg=",
"owner": "uku3lig", "owner": "uku3lig",
"repo": "api-rs", "repo": "api-rs",
"rev": "28666ade02f0c2620e128af4875b149f6e65367d", "rev": "82791dfdb2a13ad6974db91d428856956973de32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
}, },
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1725509983, "lastModified": 1724469296,
"narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=", "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=",
"owner": "Stonks3141", "owner": "Stonks3141",
"repo": "ctp-nix", "repo": "ctp-nix",
"rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9", "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1725409566, "lastModified": 1724974107,
"narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "narHash": "sha256-69+1W0Ao5K9su569YUfUPANeN/Ea7aKu7xIZP1MSl9o=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", "rev": "63396562b8e08efda3b3c66e32661b8a513055de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,6 +103,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -110,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725234343, "lastModified": 1725024810,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,6 +177,42 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghostty": { "ghostty": {
"inputs": { "inputs": {
"nixpkgs-stable": [ "nixpkgs-stable": [
@ -169,14 +221,15 @@
"nixpkgs-unstable": [ "nixpkgs-unstable": [
"nixpkgs" "nixpkgs"
], ],
"zig": "zig" "zig": "zig",
"zls": "zls"
}, },
"locked": { "locked": {
"lastModified": 1725593201, "lastModified": 1724969132,
"narHash": "sha256-rEA7C6IZV//PtAJsCIVEJjlgAbLDLkApcC6FsJ3l5TM=", "narHash": "sha256-XAYTVVxWoCXpHGqoNj0uhIbjD4MimFQXEke9eKYufK4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "cc59c5d5d94fbc873c6d0f426ee1434c0b6e0974", "rev": "602bf6ba1e1169750e233ed2431f71dbcf754362",
"revCount": 7209, "revCount": 7103,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
}, },
@ -185,6 +238,28 @@
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"ghostty",
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -192,11 +267,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725628988, "lastModified": 1724435763,
"narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -205,6 +280,18 @@
"type": "github" "type": "github"
} }
}, },
"langref": {
"flake": false,
"locked": {
"narHash": "sha256-O6p2tiKD8ZMhSX+DeA/o5hhAvcPkU2J9lFys/r11peY=",
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
}
},
"lanzaboote": { "lanzaboote": {
"inputs": { "inputs": {
"crane": [ "crane": [
@ -221,11 +308,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1725379389, "lastModified": 1722329086,
"narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +330,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725609720, "lastModified": 1725005536,
"narHash": "sha256-7aDChmbVuzVqWvwKirQmSnd9S0pXbmyv/FdQkAtKh6Q=", "narHash": "sha256-UgCk9JnYbY5MDpnQrbLbpldczutsuiLxfHE+IvaYwyU=",
"owner": "soopyc", "owner": "soopyc",
"repo": "mystia", "repo": "mystia",
"rev": "e0d774666fef9e703ceb35450873154b1220df67", "rev": "530b6659b65ddb8c82220a55333468ceb589c2a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +374,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725358307, "lastModified": 1724664098,
"narHash": "sha256-su/Nzp2X8JlaD9wPYQGXeTilaVa5H06X7A3kqCLJNuo=", "narHash": "sha256-4SgV4jCoN5RffR1Mtn3HI1cjgHmARh+rZrpVlBclj9U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "8a89995f745b1a9029d654c391a0f62ca03f7fe7", "rev": "345dfa06658a37873ca18aa205f409e4aaf1caa6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -302,11 +389,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725432240, "lastModified": 1724819573,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80", "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,7 +418,7 @@
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems_2", "systems": "systems_4",
"ukubot-rs": "ukubot-rs", "ukubot-rs": "ukubot-rs",
"vscode-extensions": "vscode-extensions" "vscode-extensions": "vscode-extensions"
} }
@ -387,6 +474,36 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"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"
}
},
"ukubot-rs": { "ukubot-rs": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
@ -397,11 +514,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725256542, "lastModified": 1724656550,
"narHash": "sha256-+ZrbTh2CMrJSeKahoFxcXrCuFgH8Yqtk+9GQNhQXtgM=", "narHash": "sha256-N4MARccverKpDj7uP6dGjNMVco6y5vrRwB1IAOqe0q8=",
"owner": "uku3lig", "owner": "uku3lig",
"repo": "ukubot-rs", "repo": "ukubot-rs",
"rev": "2db5a34f2c561b6f2eb443b088ac680eb4e1c358", "rev": "9a033bc221b9f60bf5e7e3c286eb11f906426c23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +538,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725586516, "lastModified": 1725068052,
"narHash": "sha256-zFtjhC2T86RH/1wqO453/6SESs8nq67ZsXKZ5PiX7YE=", "narHash": "sha256-WqofagIIyZ/hY6vJH65OLXVBgi2FNOezjybwniBvN14=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "028a172309c9eeb8d8f6d9d19130d703d51fde93", "rev": "27661753057dc1d259c7918f6c6777bea26290f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -458,6 +575,56 @@
"repo": "zig-overlay", "repo": "zig-overlay",
"type": "github" "type": "github"
} }
},
"zig-overlay": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"ghostty",
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1718539737,
"narHash": "sha256-hvQ900gSqzGnJWMRQwv65TixciIbC44iX0Nh5ENRwCU=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "6eb42ce6f85d247b1aecf854c45d80902821d0ad",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zls": {
"inputs": {
"flake-utils": "flake-utils_3",
"gitignore": "gitignore",
"langref": "langref",
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
],
"zig-overlay": "zig-overlay"
},
"locked": {
"lastModified": 1718930611,
"narHash": "sha256-FtfVhs6XHNfSQRQorrrz03nD0LCNp2FCnGllRntHBts=",
"owner": "zigtools",
"repo": "zls",
"rev": "0b9746b60c2020ab948f6556f1c729858b82a0f0",
"type": "github"
},
"original": {
"owner": "zigtools",
"ref": "master",
"repo": "zls",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -1,13 +1,7 @@
{pkgs, ...}: { {pkgs, ...}: {
services = { services = {
xserver.desktopManager.gnome.enable = true; xserver.desktopManager.gnome.enable = true;
displayManager = { displayManager.defaultSession = "gnome";
defaultSession = "gnome";
gdm = {
enable = true;
wayland = true;
};
};
}; };
hm.programs.gnome-shell = { hm.programs.gnome-shell = {

View file

@ -12,13 +12,7 @@
programs.hyprland.enable = true; programs.hyprland.enable = true;
services.displayManager = { services.displayManager.defaultSession = "hyprland";
defaultSession = "hyprland";
gdm = {
enable = true;
wayland = true;
};
};
xdg.portal.extraPortals = with pkgs; [xdg-desktop-portal-gtk]; xdg.portal.extraPortals = with pkgs; [xdg-desktop-portal-gtk];

View file

@ -3,13 +3,7 @@
camasca, camasca,
... ...
}: { }: {
services = { services.desktopManager.plasma6.enable = true;
desktopManager.plasma6.enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
};
environment = { environment = {
variables.SSH_AUTH_SOCK = "/run/user/1000/ssh-agent"; variables.SSH_AUTH_SOCK = "/run/user/1000/ssh-agent";