Henry-Hiles/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Latest changes

Browse source
This commit is contained in:
Henry Hiles 2024-02-07 10:04:00 -05:00
parent 6c998c8693
commit 2841490da0
7 changed files with 78 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

102
flake.lock generated
View file

@ -19,6 +19,22 @@
} }
}, },
"base16-alacritty": { "base16-alacritty": {
"flake": false,
"locked": {
"lastModified": 1703982197,
"narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=",
"owner": "aarowill",
"repo": "base16-alacritty",
"rev": "c95c200b3af739708455a03b5d185d3d2d263c6e",
"type": "github"
},
"original": {
"owner": "aarowill",
"repo": "base16-alacritty",
"type": "github"
}
},
"base16-alacritty-yaml": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1674275109, "lastModified": 1674275109,
@ -31,6 +47,7 @@
"original": { "original": {
"owner": "aarowill", "owner": "aarowill",
"repo": "base16-alacritty", "repo": "base16-alacritty",
"rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7",
"type": "github" "type": "github"
} }
}, },
@ -133,11 +150,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1703785537, "lastModified": 1707094435,
"narHash": "sha256-+1LbSEgvKS31Kx9mL5T68n8nENL3jYoGRuQR4y7W6BA=", "narHash": "sha256-QZk/qZQVt1X53peCqB2qmWhpA3xtAVgY95pebSKaTFU=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "1bdf9a04f8faa061d219294a9ad99d432b18767c", "rev": "d7db6e546d13de55fd70dc3204bd99195eb004c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +184,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1701473968, "lastModified": 1706830856,
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,16 +213,33 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1698794309,
"narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "45.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1704100519, "lastModified": 1707175763,
"narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e91c5df192395753d8e6d55a0352109cb559790", "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +255,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700847865, "lastModified": 1706001011,
"narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,11 +274,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1704072190, "lastModified": 1707095568,
"narHash": "sha256-mFPGdmkwWRuRQ1WZ0ZoM5PROLHnzV1BDM6oRKxZoHro=", "narHash": "sha256-6zZifK7cs9eWiC+3MQvlMsq2JeyH7hPSP0qZ6sTny68=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "ce0a28bdd09d04e85a4a49c6f6e64f2a0411b521", "rev": "9bde4efca9e4750ed691520d68c4c6eb308015e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,11 +289,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1703637592, "lastModified": 1706732774,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,11 +306,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1701253981, "lastModified": 1706550542,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,11 +323,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1703499205, "lastModified": 1706925685,
"narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", "rev": "79a13f1437e149dc7be2d1290c74d378dad60814",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +339,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1703637592, "lastModified": 1707092692,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -343,11 +377,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1704113806, "lastModified": 1707322565,
"narHash": "sha256-5WS7ITd0Lg4WBk4Ah8M0onADdZnVa9vX9wBcG4v/+/0=", "narHash": "sha256-yIf/7Os4ry3iCri9IRiOYipFwBuXw/Ipky59AeMkRvM=",
"owner": "wamserma", "owner": "wamserma",
"repo": "flake-programs-sqlite", "repo": "flake-programs-sqlite",
"rev": "39818027de525ab16992ad8b9752206a6d90c3b5", "rev": "70ccc21c9c5cec12573ac29264e34104e6db1ba6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,6 +405,7 @@
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
"base16-alacritty": "base16-alacritty", "base16-alacritty": "base16-alacritty",
"base16-alacritty-yaml": "base16-alacritty-yaml",
"base16-fish": "base16-fish", "base16-fish": "base16-fish",
"base16-foot": "base16-foot", "base16-foot": "base16-foot",
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
@ -378,15 +413,16 @@
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1703880383, "lastModified": 1707311311,
"narHash": "sha256-YAIbWRAKOCaWDQ4A29xXr79VTuAk9lPJSPYhMBk/VjU=", "narHash": "sha256-Se80sgOhpKxlG/6mlpezHSJjGBDzO3X0SQTn9eL2j7o=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "5a7f3f15ccc2a272e5873bb44fe378ab5d99e0ff", "rev": "9942fca8707efbd8c3f6108549f098462425d1b3",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -15,11 +15,6 @@
url = "github:viperML/wrapper-manager"; url = "github:viperML/wrapper-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# wrapper-manager-hm-compat = {
# url = "github:nrabulinski/wrapper-manager-hm-compat";
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.home-manager.follows = "home-manager";
# };
}; };
outputs = { outputs = {

3
home-manager/vscode.nix
View file

@ -34,7 +34,7 @@
} }
]; ];
userSettings = { userSettings = lib.mkForce {
"editor.guides.bracketPairs" = "active"; "editor.guides.bracketPairs" = "active";
"window.dialogStyle" = "custom"; "window.dialogStyle" = "custom";
"editor.inlineSuggest.enabled" = true; "editor.inlineSuggest.enabled" = true;
@ -87,6 +87,7 @@
"nix.serverPath" = lib.meta.getExe pkgs.nil; "nix.serverPath" = lib.meta.getExe pkgs.nil;
"nix.formatterPath" = lib.meta.getExe pkgs.alejandra; "nix.formatterPath" = lib.meta.getExe pkgs.alejandra;
"indentRainbow.ignoreErrorLanguages" = ["*"]; "indentRainbow.ignoreErrorLanguages" = ["*"];
"dart.runPubGetOnPubspecChanges" = "never";
}; };
}; };
} }

5
modules/common-desktop/adb.nix Normal file
View file

@ -0,0 +1,5 @@
{pkgs, ...}: {
services.udev.packages = [
pkgs.android-udev-rules
];
}

2
modules/common-desktop/desktop.nix
View file

@ -5,6 +5,6 @@
enable = true; enable = true;
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
layout = "us"; xkb.layout = "us";
}; };
} }

2
modules/common-desktop/packages.nix
View file

@ -30,6 +30,6 @@
nodePackages_latest.pnpm nodePackages_latest.pnpm
hunspellDicts.en_CA-large hunspellDicts.en_CA-large
inputs.nix-gaming.packages.${system}.wine-ge inputs.nix-gaming.packages.${system}.wine-ge
(retroarch.override { cores = with libretro; [bsnes-hd]; }) (retroarch.override {cores = with libretro; [bsnes-hd];})
]; ];
} }

6
wrappers/common-desktop/vesktop.nix
View file

@ -1,6 +0,0 @@
{pkgs, ...}: {
wrappers.vesktop = {
basePackage = pkgs.vesktop;
env.NIXOS_OZONE_WL.value = null;
};
}