noe/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: noe:f757a3efb0f350ea8e54bf71052d229de6b15092
Branches Tags
noe:main
...
compare: noe:92f82ed685ee9d16e4132af97f611e1d06c724d0
Branches Tags
noe:main

10 commits
f757a3efb0 ... 92f82ed685

Author SHA1 Message Date
noe
92f82ed685 update flake.lock 2024-04-30 15:41:49 -04:00
noe
1cab5cfe96 update flake.lock 2024-04-28 17:30:31 -04:00
noe
09ede00d5a update flake.lock 2024-04-28 16:49:27 -04:00
noe
95dff005c1 update flake.lock 2024-04-25 23:46:00 -04:00
noe
3d7145293c use nix 2.21 2024-04-25 03:21:50 -04:00
noe
33c35c6cc3 aerial: fix nvidia weird, plasma6 weird 2024-04-24 23:02:39 -04:00
noe
adef2d9e2d h-m/vesktop: update to recent main branch 2024-04-24 23:02:10 -04:00
noe
b4a2cf21ea s-e: update emoji flake 2024-04-24 23:01:45 -04:00
noe
04c688dda1 update flake.lock 2024-04-24 22:56:57 -04:00
noe
518d7fc038 update flake.lock 2024-04-24 22:55:36 -04:00
9 changed files with 142 additions and 72 deletions
Show stats Expand all files Collapse all files

166
flake.lock generated
View file

@ -7,11 +7,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1713653951, "lastModified": 1714264490,
"narHash": "sha256-ExbWsXGdCGIxq9iVBfP9troLzgapwh4rjGtX9neCVOc=", "narHash": "sha256-5hKsAO7ZLwOLCXeI5+jDmDr7t4zBezk0xidVWghoBB0=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "15dbcfd42d9f4924b2f9cca5942d3cb0048e147f", "rev": "4fac534b775aa0c40611257fa19ab8ab3243f4dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,29 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714013647, "lastModified": 1714013720,
"narHash": "sha256-EKKr9YzgZdhvFTa/rhxI407svNUPgvV+KMVytgL4Wxk=", "narHash": "sha256-2w0R/qMlu2jX7Ezk1nt7fdXvTnaX5VIgP+eCrfmTaDI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "045d9131e1e4131d0bbeefd2cb34eb13d25ae0d6", "rev": "a9265b4c751cd279fccb6b04de6b2d1fd1965e25",
"revCount": 4, "revCount": 5,
"type": "git",
"url": "https://git.sapphic.engineer/noe/emotes"
},
"original": {
"type": "git",
"url": "https://git.sapphic.engineer/noe/emotes"
}
},
"fedi-emotes_2": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1714013418,
"narHash": "sha256-uDYWDm4ScS1Q5Oy3M+xYn8yYkHbqHq1q1h21kipXbM0=",
"ref": "refs/heads/main",
"rev": "301a38202122431f738c4f5b31757d910a1e6491",
"revCount": 3,
"type": "git", "type": "git",
"url": "https://git.sapphic.engineer/noe/emotes" "url": "https://git.sapphic.engineer/noe/emotes"
}, },
@ -270,11 +288,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713992342, "lastModified": 1714430505,
"narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=", "narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f072c127c041eec36621b8e38a531fe0fe07961", "rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +309,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713732794, "lastModified": 1714343445,
"narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=", "narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e", "rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,11 +329,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711817618, "lastModified": 1714504185,
"narHash": "sha256-A+h24bdb9+U6htvcKAzAAGn5JZ/OyBP3nA11vJ8cqPo=", "narHash": "sha256-g9jvbL4U0DpulqkTALWQY3n+z+qkc5wWlUR34c8WrBM=",
"ref": "refs/heads/dev", "ref": "refs/heads/dev",
"rev": "6cce92816dca153d7ff3b867788a210c2a61b712", "rev": "1eb2e1a5de2215090db39f19a743b9e6c3a6d925",
"revCount": 44, "revCount": 45,
"type": "git", "type": "git",
"url": "https://iceshrimp.dev/iceshrimp/packaging" "url": "https://iceshrimp.dev/iceshrimp/packaging"
}, },
@ -347,6 +365,27 @@
"url": "https://iceshrimp.dev/noe/withdrawal" "url": "https://iceshrimp.dev/noe/withdrawal"
} }
}, },
"lightrunner-emotes": {
"inputs": {
"fedi-emotes": "fedi-emotes_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1714013511,
"narHash": "sha256-YRGt0hJqDOtJN1v1SOVq53D7q1mvzfMKOlzgiPo7faE=",
"ref": "refs/heads/main",
"rev": "385c9edd61090e463ae05c9d804866d7f78c8d90",
"revCount": 3,
"type": "git",
"url": "https://git.sapphic.engineer/noe/lightrunner-emotes"
},
"original": {
"type": "git",
"url": "https://git.sapphic.engineer/noe/lightrunner-emotes"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -355,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713543876, "lastModified": 1713946171,
"narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,7 +425,7 @@
"nixos-generators": { "nixos-generators": {
"inputs": { "inputs": {
"nixlib": "nixlib", "nixlib": "nixlib",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1713783234, "lastModified": 1713783234,
@ -404,17 +443,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713537308, "lastModified": 1714076141,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
"type": "github" "type": "github"
} }
}, },
@ -456,11 +495,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1714013158, "lastModified": 1714504791,
"narHash": "sha256-lH0WVTZbsME7cvK6fBg/Qm7IenmsMNFcl4olCXG5ySA=", "narHash": "sha256-2AcqSMSC3C/S53//RSeBk6COSe0hKF/s0JXiLVR5PMc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6421226aa5a59fa63aa43e8fc6d2d7ca33a26ca8", "rev": "c4b3e961671c8dcc66a87f0a62d82eeff789fa0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -472,11 +511,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1713828541, "lastModified": 1714272655,
"narHash": "sha256-KtvQeE12MSkCOhvVmnmcZCjnx7t31zWin2XVSDOwBDE=", "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b500489fd3cf653eafc075f9362423ad5cdd8676", "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +543,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1713895582, "lastModified": 1714253743,
"narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "572af610f6151fd41c212f897c71f7056e3fb518", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -519,6 +558,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1713596654,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1712482522, "lastModified": 1712482522,
"narHash": "sha256-Ai/xNgZpbwGcw0TSXwEPwwbPi8Iu906sB9M9z3o6UgA=", "narHash": "sha256-Ai/xNgZpbwGcw0TSXwEPwwbPi8Iu906sB9M9z3o6UgA=",
@ -534,13 +589,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1713895582, "lastModified": 1714253743,
"narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "572af610f6151fd41c212f897c71f7056e3fb518", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,7 +605,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1713596654, "lastModified": 1713596654,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
@ -579,11 +634,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1713939051, "lastModified": 1714494971,
"narHash": "sha256-EwDbsFjpXANXd2MIvRm4Bz2CDNWIhlV/659xOAxhEv0=", "narHash": "sha256-7RsTiRKMMrlwuert1QNFvnoPIwl1q1cepR4H8jv2iok=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "f2f97d844bb39559f3356e209b49c92900d860b8", "rev": "2483dff03dd326296278213a8e051d375b56d3df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,11 +655,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713543241, "lastModified": 1714337252,
"narHash": "sha256-zNDbkfdQ4MH5P/IXnXfM8g5j3E2M5KqsSx2lGbnNimw=", "narHash": "sha256-LOgfjTk2cPikavB8/SilWWt5R+gFH25vqrjwROo3Qgs=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "50701d8acd260856bb7bae6c42ff29ee4bdc70e5", "rev": "da46379747b05cbc2aee912937576e481ca57c27",
"revCount": 28, "revCount": 30,
"type": "git", "type": "git",
"url": "https://codeberg.org/noe/personal-site" "url": "https://codeberg.org/noe/personal-site"
}, },
@ -628,11 +683,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713775815, "lastModified": 1713954846,
"narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "narHash": "sha256-RWFafuSb5nkWGu8dDbW7gVb8FOQOPqmX/9MlxUUDguw=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "rev": "6fb82e44254d6a0ece014ec423cb62d92435336f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,8 +705,9 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"iceshrimp": "iceshrimp", "iceshrimp": "iceshrimp",
"iceshrimp-withdrawal": "iceshrimp-withdrawal", "iceshrimp-withdrawal": "iceshrimp-withdrawal",
"lightrunner-emotes": "lightrunner-emotes",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
@ -679,7 +735,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
@ -733,11 +789,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714012923, "lastModified": 1714506040,
"narHash": "sha256-o06P+t/BGLJWdIMzitBm2XZF04/rqFB2beBXLxhbZwE=", "narHash": "sha256-F7fK/nB93kNfqjsaSoeFHocXMjzYYj6hsp09GNajBB8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8dcd9cf3c9a50683ec7cb1ad4144c7e2210464d1", "rev": "906ab928ad6b0d4c2f80528678b334b49caf9e5c",
"revCount": 12, "revCount": 13,
"type": "git", "type": "git",
"url": "https://git.sapphic.engineer/noe/tachikoma" "url": "https://git.sapphic.engineer/noe/tachikoma"
}, },

4
flake.nix
View file

@ -62,6 +62,10 @@
url = "git+https://git.sapphic.engineer/noe/emotes"; url = "git+https://git.sapphic.engineer/noe/emotes";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lightrunner-emotes = {
url = "git+https://git.sapphic.engineer/noe/lightrunner-emotes";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
nixConfig = { nixConfig = {

18
home-manager/features/vesktop/default.nix
View file

@ -1,6 +1,20 @@
{ pkgs, ... }: { { pkgs, ... }: let
vesktop = pkgs.vesktop.overrideAttrs(final: prev: {
src = pkgs.fetchFromGitHub {
owner = "Vencord";
repo = "Vesktop";
rev = "2733727a40a4cf542277dedcf89e87e7740f962d";
hash = "sha256-EF36HbbhTuAdwBEKqYgBBu7JoP1LJneU78bROHoKqDw=";
};
home.packages = [ pkgs.vesktop ]; pnpmDeps = prev.pnpmDeps.overrideAttrs(final2: prev2: {
outputHash = "sha256-6ezEBeYmK5va3gCh00YnJzZ77V/Ql7A3l/+csohkz68=";
});
});
in {
home.packages = [
vesktop
];
# xdg.configFile = let # xdg.configFile = let
# prefix = "VencordDesktop/VencordDesktop"; # prefix = "VencordDesktop/VencordDesktop";

1
nixos/base.nix
View file

@ -61,6 +61,7 @@
}; };
nix = { nix = {
package = pkgs.nixVersions.nix_2_21;
gc.automatic = true; gc.automatic = true;
settings = { settings = {
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";

10
nixos/features/nvidia-no-vrr.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, lib, config, ... }:
let let
nvidia = config.hardware.nvidia.package; nvidia = config.hardware.nvidia.package;
vrr-off = pkgs.writeScriptBin "vrr-off" '' vrr-off = pkgs.writeScriptBin "vrr-off" ''
@ -15,9 +15,9 @@ in {
}; };
wantedBy = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ];
}; };
};
services.xserver.displayManager.setupCommands = '' services.xserver.displayManager.setupCommands = ''
${vrr-off}/bin/vrr-off ${vrr-off}/bin/vrr-off
''; '';
};
} }

2
nixos/features/nvidia.nix
View file

@ -20,6 +20,8 @@
]; ];
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];
services.displayManager.sddm.wayland.enable = lib.mkForce false;
services.xserver.enable = true;
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;

7
nixos/features/plasma6.nix
View file

@ -1,7 +1,4 @@
{ inputs, ... }: { { lib, ... }: {
# imports = [
# inputs.kde2nix.nixosModules.plasma6
# ];
services.desktopManager = { services.desktopManager = {
plasma6.enable = true; plasma6.enable = true;
@ -10,7 +7,7 @@
services.displayManager = { services.displayManager = {
sddm = { sddm = {
enable = true; enable = true;
wayland.enable = true; wayland.enable = lib.mkDefault true;
}; };
}; };
} }

4
nixos/hosts/aerial/default.nix
View file

@ -37,8 +37,4 @@
networking.firewall.allowedTCPPorts = [ 42069 8000 ]; networking.firewall.allowedTCPPorts = [ 42069 8000 ];
networking.firewall.allowedUDPPorts = [ 42069 ]; networking.firewall.allowedUDPPorts = [ 42069 ];
# services.xserver.displayManager.setupCommands = ''
# nvidia-settings -a AllowVRR=0
# '';
} }

2
nixos/hosts/sapphic-engineer/akkoma.nix
View file

@ -32,7 +32,7 @@ in {
emoji = { emoji = {
enable = true; enable = true;
emojiPackages = let emojiPackages = let
lightrunner = inputs.lightrunner-emotes.packages.${pkgs.system}; lightrunner = inputs.lightrunner-emotes.packages.${pkgs.system}.lightrunner;
in [ in [
lightrunner.hearts lightrunner.hearts
lightrunner.anime lightrunner.anime