Noctalia shell, Yazi file manager, added and removed Ghostty, general configuration changes desktop side
This commit is contained in:
123
flake.lock
generated
123
flake.lock
generated
@@ -91,11 +91,11 @@
|
|||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764724327,
|
"lastModified": 1764873433,
|
||||||
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
|
"narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
|
"rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -106,11 +106,11 @@
|
|||||||
},
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746162366,
|
"lastModified": 1761640442,
|
||||||
"narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
|
"narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
|
"rev": "4a56054d8ffc173222d09dad23adf4ba946c8884",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -127,11 +127,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765495779,
|
"lastModified": 1768135262,
|
||||||
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
|
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
|
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -148,11 +148,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763759067,
|
"lastModified": 1767609335,
|
||||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -181,11 +181,11 @@
|
|||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"host": "gitlab.gnome.org",
|
"host": "gitlab.gnome.org",
|
||||||
"lastModified": 1764524476,
|
"lastModified": 1767737596,
|
||||||
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
|
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
|
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -203,11 +203,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765823531,
|
"lastModified": 1769450270,
|
||||||
"narHash": "sha256-tyNJjd48hfgsyEfsq1Ueufg4oJv6b8xBA6NYRJrLPyg=",
|
"narHash": "sha256-pdVm/zJazDUAasTyHFX/Pbrlk9Upjxi0yzgn7GjGe4g=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "8315c1544f383b791a3115c9959d1f27920e8320",
|
"rev": "a10c1e8f5ad2589414407f4851c221cb66270257",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -218,11 +218,11 @@
|
|||||||
},
|
},
|
||||||
"master": {
|
"master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765823699,
|
"lastModified": 1769532902,
|
||||||
"narHash": "sha256-BdYVSKAvhBxGA4xO8UWKHg4IlqD88HeGIKLGof60OXk=",
|
"narHash": "sha256-Lrm0jum71juDDF6o5mfHrP+laJO6E+rStxy7AG3yi44=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ef3ade20ba7bfbcbf6bcd83eccf75e0fd5082c7a",
|
"rev": "88097c3e7404a3ac3969c7dff8ef0c5b5dda9362",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -240,11 +240,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765528634,
|
"lastModified": 1769126487,
|
||||||
"narHash": "sha256-uIavvJkDwTZD1QY/oSkDtPN9xwkLwQayoZ5xOni4SBY=",
|
"narHash": "sha256-OA+Qrrf0FWqARjgJASGrPKMUw237G3gYG+MQn4upABU=",
|
||||||
"owner": "tpwrules",
|
"owner": "tpwrules",
|
||||||
"repo": "nixos-apple-silicon",
|
"repo": "nixos-apple-silicon",
|
||||||
"rev": "fc1440d6e6adb24d9b2650670744bae35654c867",
|
"rev": "003afbd7b4f90c83497906ba2e9099874c2e3a4f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -255,11 +255,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765472234,
|
"lastModified": 1769170682,
|
||||||
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
|
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
|
"rev": "c5296fdd05cfa2c187990dd909864da9658df755",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -270,11 +270,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765644376,
|
"lastModified": 1768875095,
|
||||||
"narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=",
|
"narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe",
|
"rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -291,11 +291,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765796308,
|
"lastModified": 1769418848,
|
||||||
"narHash": "sha256-szKgoF0JbDUvWkqjB2AyyFagmsF5ZFEjajZRUiUV9mU=",
|
"narHash": "sha256-jLSg9IkglcIw64kU1utXxsxXhiVdD45dkh9ZJKaFQ7U=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "12a76dd12beccd8d18249b05d10d6acda4e722e0",
|
"rev": "c19a0517ddeed4c1548611e42e187048fc2e5dcf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -304,6 +304,26 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"noctalia": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1769531393,
|
||||||
|
"narHash": "sha256-weMRIp4HHCE3FWHmQcdsRKt0KHTfydnn/YTSVXTcBG8=",
|
||||||
|
"owner": "noctalia-dev",
|
||||||
|
"repo": "noctalia-shell",
|
||||||
|
"rev": "cb56fa7089d9c3b8761979624326e21cc0c317b7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "noctalia-dev",
|
||||||
|
"repo": "noctalia-shell",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": [
|
"flake-parts": [
|
||||||
@@ -316,11 +336,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764773531,
|
"lastModified": 1767810917,
|
||||||
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
|
"narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
|
"rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -337,6 +357,7 @@
|
|||||||
"nixos-apple-silicon": "nixos-apple-silicon",
|
"nixos-apple-silicon": "nixos-apple-silicon",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
|
"noctalia": "noctalia",
|
||||||
"stylix": "stylix",
|
"stylix": "stylix",
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
@@ -362,11 +383,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765812876,
|
"lastModified": 1769471853,
|
||||||
"narHash": "sha256-mML2DlWmvwPOzn8K9QEsiKGdt67iHW/LaK6Xw+ZENMk=",
|
"narHash": "sha256-aqs0HkV2T/7Syf/pYLRVSwfk23PPAyGJmWT43U5ZSF4=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "9ba353558a288eb9d6fc3057bb418509dd8b4c01",
|
"rev": "805fa4262a21ada28cc918fa014359b9b35caea7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -441,11 +462,11 @@
|
|||||||
"tinted-schemes": {
|
"tinted-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763914658,
|
"lastModified": 1767710407,
|
||||||
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
|
"narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "schemes",
|
"repo": "schemes",
|
||||||
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
|
"rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -457,11 +478,11 @@
|
|||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764465359,
|
"lastModified": 1767489635,
|
||||||
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
|
"narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
|
"rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -473,11 +494,11 @@
|
|||||||
"tinted-zed": {
|
"tinted-zed": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764464512,
|
"lastModified": 1767488740,
|
||||||
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
|
"narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-zed",
|
"repo": "base16-zed",
|
||||||
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
|
"rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -496,11 +517,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765764138,
|
"lastModified": 1769491693,
|
||||||
"narHash": "sha256-Nb5y5xSDQLMeUYiA1bQkbmHffGm0d/XXWoJjFu8ovw0=",
|
"narHash": "sha256-bbqeCDML1yXI6kpy8q8BshKRV1szk3xV0StAbzw4Z+o=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "bd8815d0a686267386268e7cc70315124e21362b",
|
"rev": "708e0f10aba5de7d0f55883d06fa08aa6a7cd462",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
17
flake.nix
17
flake.nix
@@ -14,6 +14,10 @@
|
|||||||
};
|
};
|
||||||
master.url = "github:NixOS/nixpkgs/master";
|
master.url = "github:NixOS/nixpkgs/master";
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
|
noctalia = {
|
||||||
|
url = "github:noctalia-dev/noctalia-shell";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
nixvim = {
|
nixvim = {
|
||||||
url = "github:nix-community/nixvim";
|
url = "github:nix-community/nixvim";
|
||||||
#inputs.nixpkgs.follows = "nixpkgs";
|
#inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -29,7 +33,7 @@
|
|||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, stylix, astal, nixpkgs, home-manager, zen-browser, master, nixos-apple-silicon, nixvim }@inputs:
|
outputs = { self, stylix, astal, nixpkgs, home-manager, zen-browser, master, nixos-apple-silicon, nixvim, noctalia,... }@inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
@@ -43,15 +47,14 @@
|
|||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {inherit nixvim; inherit pkgs-master;};
|
specialArgs = {inherit nixvim; inherit pkgs-master;};
|
||||||
specialArgs.inputs = inputs;
|
specialArgs.inputs = inputs;
|
||||||
modules = [
|
modules = [
|
||||||
#stylix.nixosModules.stylix
|
./hosts/desktop/configuration.nix
|
||||||
./hosts/desktop/configuration.nix
|
home-manager.nixosModules.home-manager
|
||||||
home-manager.nixosModules.home-manager
|
{
|
||||||
{
|
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
home-manager.extraSpecialArgs = {inherit inputs;};
|
||||||
home-manager.users.joshuaelm = {
|
home-manager.users.joshuaelm = {
|
||||||
imports = [ ./hosts/desktop/home.nix nixvim.homeModules.nixvim stylix.homeModules.stylix ];
|
imports = [ ./hosts/desktop/home.nix nixvim.homeModules.nixvim stylix.homeModules.stylix ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -11,10 +11,14 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.grub.enable = true;
|
/*boot.loader.grub.enable = true;
|
||||||
boot.loader.grub.devices = ["nodev"];
|
boot.loader.grub.devices = ["nodev"];
|
||||||
boot.loader.grub.useOSProber = true;
|
boot.loader.grub.useOSProber = true;
|
||||||
boot.loader.grub.efiSupport = true;
|
boot.loader.grub.efiSupport = true;*/
|
||||||
|
boot.loader.limine = {
|
||||||
|
enable = true;
|
||||||
|
secureBoot.enable = true;
|
||||||
|
};
|
||||||
boot.initrd.systemd.enable = true;
|
boot.initrd.systemd.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
services.avahi = {
|
services.avahi = {
|
||||||
@@ -77,12 +81,11 @@ boot = {
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.udev.extraRules = ''
|
||||||
services.udev.extraRules = ''
|
SUBSYSTEM=="tty", KERNEL=="ttyACM*", ATTRS{idVendor}=="346e", ACTION=="add", MODE="0666", TAG+="uaccess"
|
||||||
ACTION=="add", KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="35bd", ATTRS{idProduct}=="0101", TAG+="uaccess", MODE="0660"
|
'';
|
||||||
'';
|
|
||||||
|
boot.extraModulePackages = with config.boot.kernelPackages; [ universal-pidff xpadneo ];
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [ hid-tmff2 xpadneo ];
|
|
||||||
|
|
||||||
networking.hostName = "nixos"; # Define your hostname.
|
networking.hostName = "nixos"; # Define your hostname.
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
@@ -151,7 +154,7 @@ boot = {
|
|||||||
enable = true;
|
enable = true;
|
||||||
settings = rec {
|
settings = rec {
|
||||||
initial_session = {
|
initial_session = {
|
||||||
command = "dbus-launch ${pkgs.hyprland}/bin/Hyprland";
|
command = "dbus-launch ${pkgs.hyprland}/bin/start-hyprland";
|
||||||
user = "joshuaelm";
|
user = "joshuaelm";
|
||||||
};
|
};
|
||||||
default_session = initial_session;
|
default_session = initial_session;
|
||||||
@@ -160,6 +163,7 @@ boot = {
|
|||||||
|
|
||||||
# Steam Deck Gamemode
|
# Steam Deck Gamemode
|
||||||
programs.steam.gamescopeSession.enable = true;
|
programs.steam.gamescopeSession.enable = true;
|
||||||
|
programs.gamemode.enable = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -168,6 +172,7 @@ boot = {
|
|||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
||||||
|
|
||||||
|
services.fwupd.enable = true;
|
||||||
|
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
@@ -180,10 +185,11 @@ boot = {
|
|||||||
|
|
||||||
# Enable Swap
|
# Enable Swap
|
||||||
|
|
||||||
/*swapDevices = [ {
|
swapDevices = [ {
|
||||||
device = "/var/lib/swapfile";
|
device = "/var/lib/swapfile";
|
||||||
size = 16*1024;
|
size = 16*1024;
|
||||||
}];*/
|
}];
|
||||||
|
zramSwap.enable = true;
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
@@ -203,42 +209,14 @@ boot = {
|
|||||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||||
# no need to redefine it in your config for now)
|
# no need to redefine it in your config for now)
|
||||||
#media-session.enable = true;
|
#media-session.enable = true;
|
||||||
wireplumber.configPackages = [
|
extraConfig.pipewire."92-low-latency" = {
|
||||||
(pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/alsa.conf" ''
|
"context.properties" = {
|
||||||
monitor.alsa.rules = [
|
"default.clock.rate" = 48000;
|
||||||
{
|
"default.clock.quantum" = 32;
|
||||||
matches = [
|
"default.clock.min-quantum" = 32;
|
||||||
{
|
"default.clock.max-quantum" = 32;
|
||||||
device.name = "~alsa_card.*"
|
};
|
||||||
}
|
};
|
||||||
]
|
|
||||||
actions = {
|
|
||||||
update-props = {
|
|
||||||
# Device settings
|
|
||||||
api.alsa.use-acp = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
{
|
|
||||||
matches = [
|
|
||||||
{
|
|
||||||
node.name = "~alsa_input.*"
|
|
||||||
}
|
|
||||||
{
|
|
||||||
node.name = "~alsa_output.*"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
actions = {
|
|
||||||
# Node settings
|
|
||||||
update-props = {
|
|
||||||
session.suspend-timeout-seconds = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
|
|
||||||
};
|
};
|
||||||
services.pulseaudio.configFile = pkgs.runCommand "default.pa" {} ''
|
services.pulseaudio.configFile = pkgs.runCommand "default.pa" {} ''
|
||||||
sed 's/module-udev-detect$/module-udev-detect tsched=0/' \
|
sed 's/module-udev-detect$/module-udev-detect tsched=0/' \
|
||||||
@@ -250,24 +228,6 @@ boot = {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
services.pipewire.extraConfig.pipewire-pulse."92-low-latency" = {
|
|
||||||
context.modules = [
|
|
||||||
{
|
|
||||||
name = "libpipewire-module-protocol-pulse";
|
|
||||||
args = {
|
|
||||||
pulse.min.req = "128/48000";
|
|
||||||
pulse.default.req = "128/48000";
|
|
||||||
pulse.max.req = "128/48000";
|
|
||||||
pulse.min.quantum = "128/48000";
|
|
||||||
pulse.max.quantum = "128/48000";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
stream.properties = {
|
|
||||||
node.latency = "128/48000";
|
|
||||||
resample.quality = 1;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
services.pulseaudio.extraConfig = ''
|
services.pulseaudio.extraConfig = ''
|
||||||
.nofail
|
.nofail
|
||||||
unload-module module-suspend-on-idle
|
unload-module module-suspend-on-idle
|
||||||
@@ -279,7 +239,6 @@ services.pulseaudio.extraConfig = ''
|
|||||||
# services.xserver.libinput.enable = true;
|
# services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
programs.adb.enable = true;
|
|
||||||
users.users.joshuaelm = {
|
users.users.joshuaelm = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Joshua Elmasri";
|
description = "Joshua Elmasri";
|
||||||
@@ -305,7 +264,7 @@ services.pulseaudio.extraConfig = ''
|
|||||||
# Configure drives
|
# Configure drives
|
||||||
|
|
||||||
fileSystems."/mnt/Games" = {
|
fileSystems."/mnt/Games" = {
|
||||||
device = "/dev/nvme0n1p1";
|
device = "/dev/disk/by-uuid/732d1907-5225-48a9-834e-e239af475b79";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"users"
|
"users"
|
||||||
@@ -316,8 +275,8 @@ services.pulseaudio.extraConfig = ''
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*fileSystems."/mnt/More-Games" = {
|
fileSystems."/mnt/More-Games" = {
|
||||||
device = "/dev/sdb1";
|
device = "/dev/disk/by-uuid/f0f2dd27-f802-40f6-827b-23e0462b55f6";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [
|
options = [
|
||||||
"users"
|
"users"
|
||||||
@@ -325,7 +284,7 @@ services.pulseaudio.extraConfig = ''
|
|||||||
"x-gvfs-show"
|
"x-gvfs-show"
|
||||||
"exec"
|
"exec"
|
||||||
];
|
];
|
||||||
};*/
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -369,10 +328,9 @@ services.pulseaudio.extraConfig = ''
|
|||||||
ffmpeg
|
ffmpeg
|
||||||
oversteer
|
oversteer
|
||||||
# cemu broken with latest update
|
# cemu broken with latest update
|
||||||
oterm
|
|
||||||
wget
|
wget
|
||||||
wlx-overlay-s
|
|
||||||
unzip
|
unzip
|
||||||
|
wayvr
|
||||||
winetricks
|
winetricks
|
||||||
cowsay
|
cowsay
|
||||||
pfetch
|
pfetch
|
||||||
@@ -380,9 +338,10 @@ services.pulseaudio.extraConfig = ''
|
|||||||
gomatrix
|
gomatrix
|
||||||
python3
|
python3
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
sbctl
|
||||||
|
boxflat
|
||||||
bluebubbles
|
bluebubbles
|
||||||
xfce.thunar
|
thunar
|
||||||
parallel-launcher
|
|
||||||
corectrl
|
corectrl
|
||||||
wiremix
|
wiremix
|
||||||
termsonic
|
termsonic
|
||||||
@@ -395,7 +354,6 @@ services.pulseaudio.extraConfig = ''
|
|||||||
protonup-qt
|
protonup-qt
|
||||||
heroic
|
heroic
|
||||||
protontricks
|
protontricks
|
||||||
gamescope
|
|
||||||
playerctl
|
playerctl
|
||||||
wine
|
wine
|
||||||
libreoffice
|
libreoffice
|
||||||
@@ -429,7 +387,7 @@ services.pulseaudio.extraConfig = ''
|
|||||||
enable = false;
|
enable = false;
|
||||||
defaultRuntime = true; # Register as default OpenXR runtime
|
defaultRuntime = true; # Register as default OpenXR runtime
|
||||||
};
|
};
|
||||||
services.wivrn.enable = true;
|
services.wivrn.enable = false;
|
||||||
services.wivrn.package = pkgs-master.wivrn;
|
services.wivrn.package = pkgs-master.wivrn;
|
||||||
services.wivrn.defaultRuntime = true;
|
services.wivrn.defaultRuntime = true;
|
||||||
systemd.user.services.monado.environment = {
|
systemd.user.services.monado.environment = {
|
||||||
@@ -462,7 +420,7 @@ services.pulseaudio.extraConfig = ''
|
|||||||
|
|
||||||
programs.gamescope = {
|
programs.gamescope = {
|
||||||
enable = true;
|
enable = true;
|
||||||
capSysNice = true;
|
capSysNice = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.nix-ld.enable = true;
|
programs.nix-ld.enable = true;
|
||||||
@@ -486,7 +444,7 @@ services.pulseaudio.extraConfig = ''
|
|||||||
networking.firewall.allowedTCPPorts = [ 7860 3042 3246 9943 9944 7801 11434 47990 48010 5001 8188 ];
|
networking.firewall.allowedTCPPorts = [ 7860 3042 3246 9943 9944 7801 11434 47990 48010 5001 8188 ];
|
||||||
networking.firewall.allowedUDPPorts = [ 7860 8188 9943 9944 3042 47990 3246 11434 7801 4800 48010 ];
|
networking.firewall.allowedUDPPorts = [ 7860 8188 9943 9944 3042 47990 3246 11434 7801 4800 48010 ];
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
home.username = "joshuaelm";
|
home.username = "joshuaelm";
|
||||||
home.homeDirectory = "/home/joshuaelm";
|
home.homeDirectory = "/home/joshuaelm";
|
||||||
|
|
||||||
imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr ../../modules/ashell ../../modules/waybar/waybar.nix ../../modules/zen ../../modules/rofi ../../modules/kitty ../../modules/cava ../../modules/starship ../../modules/fuzzel ../../modules/nushell ];
|
imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr ../../modules/ashell ../../modules/waybar/waybar.nix ../../modules/zen ../../modules/rofi ../../modules/kitty ../../modules/cava ../../modules/starship ../../modules/noctalia ../../modules/yazi ../../modules/fuzzel ../../modules/ghostty ../../modules/nushell ];
|
||||||
|
|
||||||
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
|
|||||||
7
modules/ghostty/default.nix
Normal file
7
modules/ghostty/default.nix
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{pkgs, ...}:
|
||||||
|
{
|
||||||
|
programs.ghostty.enable = true;
|
||||||
|
programs.ghostty.settings = {
|
||||||
|
font-family = "Fira Code";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -17,8 +17,7 @@ monitor = DP-1, highres@highrr, 0x0, 1
|
|||||||
#monitor = DP-1, highres@highrr, 0x0, 1, bitdepth, 10, cm, hdr, sdrsaturation, 1, sdrbrightness, 1
|
#monitor = DP-1, highres@highrr, 0x0, 1, bitdepth, 10, cm, hdr, sdrsaturation, 1, sdrbrightness, 1
|
||||||
exec-once = hyprctl dispatch workspace 1
|
exec-once = hyprctl dispatch workspace 1
|
||||||
#exec-once = linux-wallpaperengine --screen-root HDMI-A-1 --silent --fps 60 3000562427
|
#exec-once = linux-wallpaperengine --screen-root HDMI-A-1 --silent --fps 60 3000562427
|
||||||
exec-once = hyprlock
|
exec-once = noctalia-shell& sleep 2 && noctalia-shell ipc call lockScreen lock
|
||||||
exec-once = waybar
|
|
||||||
exec-once = pw-metadata -n settings 0 clock.force-quantum 2048
|
exec-once = pw-metadata -n settings 0 clock.force-quantum 2048
|
||||||
# exec-once = ashell
|
# exec-once = ashell
|
||||||
exec-once = systemctl --user start hyprpolkitagent
|
exec-once = systemctl --user start hyprpolkitagent
|
||||||
@@ -31,10 +30,10 @@ exec-once = sunshine
|
|||||||
debug:full_cm_proto=true
|
debug:full_cm_proto=true
|
||||||
|
|
||||||
# Set programs that you use
|
# Set programs that you use
|
||||||
$terminal = kitty nu
|
$terminal = kitty -e nu
|
||||||
$fileManager = thunar
|
$fileManager = kitty -e yazi
|
||||||
$menu = fuzzel
|
$menu = noctalia-shell ipc call launcher toggle
|
||||||
$bar = waybar
|
$bar = noctalia-shell
|
||||||
|
|
||||||
# Some default env vars.
|
# Some default env vars.
|
||||||
env = XCURSOR_SIZE,24
|
env = XCURSOR_SIZE,24
|
||||||
@@ -75,7 +74,7 @@ general {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
windowrulev2 = immediate, class:^(cs2)$
|
# windowrulev2 = immediate, class:^(cs2)$
|
||||||
|
|
||||||
decoration {
|
decoration {
|
||||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||||
@@ -119,7 +118,6 @@ dwindle {
|
|||||||
preserve_split = yes # you probably want this
|
preserve_split = yes # you probably want this
|
||||||
}
|
}
|
||||||
|
|
||||||
layerrule = unset, overlay
|
|
||||||
|
|
||||||
gestures {
|
gestures {
|
||||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||||
@@ -144,7 +142,6 @@ misc {
|
|||||||
|
|
||||||
# Window Rules
|
# Window Rules
|
||||||
|
|
||||||
windowrule = float, class:^(Wiremix)$
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||||
$mainMod = SUPER
|
$mainMod = SUPER
|
||||||
@@ -152,7 +149,7 @@ $mainMod = SUPER
|
|||||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
||||||
bind = $mainMod, Return, exec, $terminal
|
bind = $mainMod, Return, exec, $terminal
|
||||||
bind = $mainMod, Q, killactive,
|
bind = $mainMod, Q, killactive,
|
||||||
bind = $mainMod, M, exec, hyprlock
|
bind = $mainMod, M, exec, noctalia-shell ipc call lockScreen lock
|
||||||
bind = $mainMod, E, exec, $fileManager
|
bind = $mainMod, E, exec, $fileManager
|
||||||
bind = $mainMod, V, togglefloating,
|
bind = $mainMod, V, togglefloating,
|
||||||
bind = $mainMod, Space, exec, $menu
|
bind = $mainMod, Space, exec, $menu
|
||||||
|
|||||||
81
modules/noctalia/default.nix
Normal file
81
modules/noctalia/default.nix
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
{pkgs, inputs, lib,...}:
|
||||||
|
{
|
||||||
|
imports = [ inputs.noctalia.homeModules.default ];
|
||||||
|
programs.noctalia-shell = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
general = {
|
||||||
|
avatarImage = "/home/joshuaelm/NixOS-configs/pfp.jpg";
|
||||||
|
};
|
||||||
|
bar = lib.mkForce {
|
||||||
|
position = "top";
|
||||||
|
monitors = [ ];
|
||||||
|
density = "default";
|
||||||
|
showOutline = false;
|
||||||
|
showCapsule = true;
|
||||||
|
capsuleOpacity = 1;
|
||||||
|
backgroundOpacity = 1;
|
||||||
|
useSeparateOpacity = false;
|
||||||
|
floating = false;
|
||||||
|
marginVertical = 4;
|
||||||
|
marginHorizontal = 4;
|
||||||
|
outerCorners = true;
|
||||||
|
exclusive = true;
|
||||||
|
hideOnOverview = false;
|
||||||
|
widgets = {
|
||||||
|
left = [
|
||||||
|
{
|
||||||
|
id = "ControlCenter";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "Workspace";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
center = [
|
||||||
|
{
|
||||||
|
id = "Clock";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "MediaMini";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
right = [
|
||||||
|
{
|
||||||
|
id = "Tray";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "Volume";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id = "Battery";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
id= "Brightness";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
wallpaper = {
|
||||||
|
enabled = true;
|
||||||
|
};
|
||||||
|
appLauncher = {
|
||||||
|
terminalCommand = "kitty -e";
|
||||||
|
};
|
||||||
|
location = {
|
||||||
|
monthBeforeDay = true;
|
||||||
|
name = "Cedar Hill, United States";
|
||||||
|
weatherEnabled = true;
|
||||||
|
weatherShowEffects = true;
|
||||||
|
useFahrenheit = true;
|
||||||
|
use12hourFormat = false;
|
||||||
|
showWeekNumberInCalendar = false;
|
||||||
|
showCalendarEvents = false;
|
||||||
|
showCalendarWeather = true;
|
||||||
|
analogClockInCalendar = false;
|
||||||
|
firstDayOfWeek = -1;
|
||||||
|
hideWeatherTimezone = false;
|
||||||
|
hideWeatherCityName = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
#stylix.targets.plymouth.enable = false;
|
#stylix.targets.plymouth.enable = false;
|
||||||
stylix.targets.kitty.enable = true;
|
stylix.targets.kitty.enable = true;
|
||||||
stylix.targets.hyprpaper.enable = true;
|
stylix.targets.hyprpaper.enable = true;
|
||||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
|
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
|
||||||
stylix.targets.zen-browser.profileNames = [ "default" ];
|
stylix.targets.zen-browser.profileNames = [ "default" ];
|
||||||
stylix.targets.zen-browser.enable = true;
|
stylix.targets.zen-browser.enable = true;
|
||||||
# blue aura house
|
# blue aura house
|
||||||
@@ -26,9 +26,15 @@
|
|||||||
};*/
|
};*/
|
||||||
|
|
||||||
# Mountain Range with tree vignette
|
# Mountain Range with tree vignette
|
||||||
stylix.image = pkgs.fetchurl {
|
/*stylix.image = pkgs.fetchurl {
|
||||||
url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/generic/wallhaven-21yp59.jpg";
|
url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/generic/wallhaven-21yp59.jpg";
|
||||||
hash = "sha256-INsc8Zx+Slmcyd/tNekuZ0LhNSlvNLy7TNFLdnJD78Q=";
|
hash = "sha256-INsc8Zx+Slmcyd/tNekuZ0LhNSlvNLy7TNFLdnJD78Q=";
|
||||||
|
};*/
|
||||||
|
|
||||||
|
# Icy Mountains with Ocean Night
|
||||||
|
stylix.image = pkgs.fetchurl {
|
||||||
|
url = "https://gitea.base.jeditemple.com/joshuaelm/Wallpapers/raw/branch/main/generic/Icy%20Mountains%20Blue%20Night.png";
|
||||||
|
hash = "sha256-X67ljSsASOXIzNti6cMmLYJ5pO14C3tdWmVpZ/n2R6E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
6
modules/yazi/default.nix
Normal file
6
modules/yazi/default.nix
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{pkgs, ...}:
|
||||||
|
{
|
||||||
|
programs.yazi = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user